Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2082453003: 🎅 Use GN's dependency info for native libraries in write_build_config.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix osmesa on non-android Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 7
8 assert(is_android) 8 assert(is_android)
9 9
10 # Write the target's .build_config file. This is a json file that contains a 10 # Write the target's .build_config file. This is a json file that contains a
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 args += [ "--has-alternative-locale-resource" ] 184 args += [ "--has-alternative-locale-resource" ]
185 } 185 }
186 } 186 }
187 187
188 if (is_android_resources && defined(invoker.resource_dirs)) { 188 if (is_android_resources && defined(invoker.resource_dirs)) {
189 resource_dirs = rebase_path(invoker.resource_dirs, root_build_dir) 189 resource_dirs = rebase_path(invoker.resource_dirs, root_build_dir)
190 args += [ "--resource-dirs=$resource_dirs" ] 190 args += [ "--resource-dirs=$resource_dirs" ]
191 } 191 }
192 192
193 if (is_apk) { 193 if (is_apk) {
194 if (defined(invoker.native_libs)) { 194 if (defined(invoker.shared_libraries_runtime_deps_file)) {
195 inputs += invoker.native_libs 195 # Don't list shared_libraries_runtime_deps_file as an input in order to
196 rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir) 196 # avoid having to depend on the runtime_deps target. See comment in
197 rebased_android_readelf = rebase_path(android_readelf, root_build_dir) 197 # rules.gni for why we do this.
198 args += [ 198 args += [
199 "--native-libs=$rebased_native_libs", 199 "--shared-libraries-runtime-deps",
200 "--readelf-path=$rebased_android_readelf", 200 rebase_path(invoker.shared_libraries_runtime_deps_file,
201 root_build_dir),
201 ] 202 ]
202 } 203 }
203 204
204 if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) { 205 if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
205 args += [ 206 args += [
206 "--proguard-enabled", 207 "--proguard-enabled",
207 "--proguard-info", 208 "--proguard-info",
208 rebase_path(invoker.proguard_info, root_build_dir), 209 rebase_path(invoker.proguard_info, root_build_dir),
209 ] 210 ]
210 } 211 }
(...skipping 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2379 outputs = [ 2380 outputs = [
2380 depfile, 2381 depfile,
2381 invoker.out_manifest, 2382 invoker.out_manifest,
2382 ] 2383 ]
2383 inputs = [ 2384 inputs = [
2384 invoker.main_manifest, 2385 invoker.main_manifest,
2385 ] 2386 ]
2386 } 2387 }
2387 } 2388 }
2388 } 2389 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698