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

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

Issue 870093002: Add apk native libs to the inputs of appropriate actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 if (defined(invoker.custom_package)) { 266 if (defined(invoker.custom_package)) {
267 args += [ 267 args += [
268 "--package-name", 268 "--package-name",
269 invoker.custom_package, 269 invoker.custom_package,
270 ] 270 ]
271 } 271 }
272 } 272 }
273 273
274 if (is_apk) { 274 if (is_apk) {
275 if (defined(invoker.native_libs)) { 275 if (defined(invoker.native_libs)) {
276 inputs += invoker.native_libs
276 rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir) 277 rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir)
277 rebased_android_readelf = rebase_path(android_readelf, root_build_dir) 278 rebased_android_readelf = rebase_path(android_readelf, root_build_dir)
278 args += [ 279 args += [
279 "--native-libs=$rebased_native_libs", 280 "--native-libs=$rebased_native_libs",
280 "--readelf-path=$rebased_android_readelf", 281 "--readelf-path=$rebased_android_readelf",
281 ] 282 ]
282 } 283 }
283 } 284 }
284 285
285 if (defined(invoker.srcjar)) { 286 if (defined(invoker.srcjar)) {
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 rebased_build_config = rebase_path(build_config, root_build_dir) 1078 rebased_build_config = rebase_path(build_config, root_build_dir)
1078 dex(target_name) { 1079 dex(target_name) {
1079 inputs = [ 1080 inputs = [
1080 build_config, 1081 build_config,
1081 ] 1082 ]
1082 output = invoker.dex_path 1083 output = invoker.dex_path
1083 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files" 1084 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
1084 args = [ "--inputs=@FileArg($dex_arg_key)" ] 1085 args = [ "--inputs=@FileArg($dex_arg_key)" ]
1085 } 1086 }
1086 } 1087 }
OLDNEW
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698