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

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

Issue 1217583002: Fix GN build errors when splits are enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add parameter docs Created 5 years, 5 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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 _config = invoker.split_config 783 _config = invoker.split_config
784 _type = invoker.split_type 784 _type = invoker.split_type
785 input_apk_path = "${_resource_packaged_apk_path}_${_config}" 785 input_apk_path = "${_resource_packaged_apk_path}_${_config}"
786 _output_paths = process_file_template( 786 _output_paths = process_file_template(
787 [ _final_apk_path ], 787 [ _final_apk_path ],
788 "{{source_dir}}/{{source_name_part}}-${_type}-${_config}.apk") 788 "{{source_dir}}/{{source_name_part}}-${_type}-${_config}.apk")
789 output_apk_path = _output_paths[0] 789 output_apk_path = _output_paths[0]
790 keystore_path = _keystore_path 790 keystore_path = _keystore_path
791 keystore_name = _keystore_name 791 keystore_name = _keystore_name
792 keystore_password = _keystore_password 792 keystore_password = _keystore_password
793 deps = [
794 ":${_package_resources_target_name}",
795 ]
793 } 796 }
794 } 797 }
795 798
796 foreach(_split, _split_densities) { 799 foreach(_split, _split_densities) {
797 _split_rule = "${target_name}__finalize_${_split}_split" 800 _split_rule = "${target_name}__finalize_${_split}_split"
798 finalize_split(_split_rule) { 801 finalize_split(_split_rule) {
799 split_type = "density" 802 split_type = "density"
800 split_config = _split 803 split_config = _split
801 } 804 }
802 _final_deps += [ ":$_split_rule" ] 805 _final_deps += [ ":$_split_rule" ]
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 } 1472 }
1470 1473
1471 # Creates an AndroidManifest.xml for an APK split. 1474 # Creates an AndroidManifest.xml for an APK split.
1472 template("generate_split_manifest") { 1475 template("generate_split_manifest") {
1473 assert(defined(invoker.main_manifest)) 1476 assert(defined(invoker.main_manifest))
1474 assert(defined(invoker.out_manifest)) 1477 assert(defined(invoker.out_manifest))
1475 assert(defined(invoker.split_name)) 1478 assert(defined(invoker.split_name))
1476 1479
1477 action(target_name) { 1480 action(target_name) {
1478 depfile = "$target_gen_dir/$target_name.d" 1481 depfile = "$target_gen_dir/$target_name.d"
1482 if (defined(invoker.deps)) {
1483 deps = invoker.deps
1484 }
1479 args = [ 1485 args = [
1480 "--main-manifest", 1486 "--main-manifest",
1481 rebase_path(invoker.main_manifest, root_build_dir), 1487 rebase_path(invoker.main_manifest, root_build_dir),
1482 "--out-manifest", 1488 "--out-manifest",
1483 rebase_path(invoker.out_manifest, root_build_dir), 1489 rebase_path(invoker.out_manifest, root_build_dir),
1484 "--split", 1490 "--split",
1485 invoker.split_name, 1491 invoker.split_name,
1486 ] 1492 ]
1487 if (defined(invoker.version_code)) { 1493 if (defined(invoker.version_code)) {
1488 args += [ 1494 args += [
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 ] 1570 ]
1565 args = [ 1571 args = [
1566 "--depfile", 1572 "--depfile",
1567 rebase_path(depfile, root_build_dir), 1573 rebase_path(depfile, root_build_dir),
1568 "--script-output-path", 1574 "--script-output-path",
1569 rebase_path(generated_script, root_build_dir), 1575 rebase_path(generated_script, root_build_dir),
1570 ] 1576 ]
1571 args += test_runner_args 1577 args += test_runner_args
1572 } 1578 }
1573 } 1579 }
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