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

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

Issue 1149893018: Fixes for GN Android build inputs/outputs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | build/config/android/rules.gni » ('J')
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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 } 661 }
662 662
663 package_target = "${target_name}__package" 663 package_target = "${target_name}__package"
664 action(package_target) { 664 action(package_target) {
665 script = "//build/android/gyp/ant.py" 665 script = "//build/android/gyp/ant.py"
666 _ant_script = "//build/android/ant/apk-package.xml" 666 _ant_script = "//build/android/ant/apk-package.xml"
667 667
668 deps = [ 668 deps = [
669 ":${_package_resources_target_name}", 669 ":${_package_resources_target_name}",
670 ] 670 ]
671 if (defined(invoker.deps)) {
672 deps += invoker.deps
673 }
671 depfile = "$target_gen_dir/$target_name.d" 674 depfile = "$target_gen_dir/$target_name.d"
672 675
673 inputs = [ 676 inputs = [
674 _resource_packaged_apk_path, 677 _resource_packaged_apk_path,
675 _ant_script, 678 _ant_script,
676 ] 679 ]
677 if (defined(_dex_path)) { 680 if (defined(_dex_path)) {
678 inputs += [ _dex_path ] 681 inputs += [ _dex_path ]
679 } 682 }
680 683
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 outputs += [ all_resources_zip ] 1241 outputs += [ all_resources_zip ]
1239 args += [ 1242 args += [
1240 "--all-resources-zip-out", 1243 "--all-resources-zip-out",
1241 rebase_path(all_resources_zip, root_build_dir), 1244 rebase_path(all_resources_zip, root_build_dir),
1242 ] 1245 ]
1243 } 1246 }
1244 1247
1245 if (defined(invoker.args)) { 1248 if (defined(invoker.args)) {
1246 args += invoker.args 1249 args += invoker.args
1247 } 1250 }
1251 if (defined(invoker.deps)) {
1252 deps = invoker.deps
1253 }
1248 } 1254 }
1249 } 1255 }
1250 1256
1251 template("copy_ex") { 1257 template("copy_ex") {
1252 set_sources_assignment_filter([]) 1258 set_sources_assignment_filter([])
1253 if (defined(invoker.testonly)) { 1259 if (defined(invoker.testonly)) {
1254 testonly = invoker.testonly 1260 testonly = invoker.testonly
1255 } 1261 }
1256 1262
1257 action(target_name) { 1263 action(target_name) {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 script = "//build/android/gyp/generate_split_manifest.py" 1370 script = "//build/android/gyp/generate_split_manifest.py"
1365 outputs = [ 1371 outputs = [
1366 depfile, 1372 depfile,
1367 invoker.out_manifest, 1373 invoker.out_manifest,
1368 ] 1374 ]
1369 inputs = [ 1375 inputs = [
1370 invoker.main_manifest, 1376 invoker.main_manifest,
1371 ] 1377 ]
1372 } 1378 }
1373 } 1379 }
OLDNEW
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | build/config/android/rules.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698