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

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

Issue 1354153004: GN: Don't build final_dex when building *_incremental targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split up Created 5 years, 2 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 | « build/config/android/internal_rules.gni ('k') | no next file » | 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("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/internal_rules.gni") 7 import("//build/config/android/internal_rules.gni")
8 import("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 import("//third_party/android_platform/config.gni") 9 import("//third_party/android_platform/config.gni")
10 import("//tools/grit/grit_rule.gni") 10 import("//tools/grit/grit_rule.gni")
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 1533
1534 keystore_name = _keystore_name 1534 keystore_name = _keystore_name
1535 keystore_path = _keystore_path 1535 keystore_path = _keystore_path
1536 keystore_password = _keystore_password 1536 keystore_password = _keystore_password
1537 1537
1538 # This target generates the input file _all_resources_zip_path. 1538 # This target generates the input file _all_resources_zip_path.
1539 deps = _android_manifest_deps + [ 1539 deps = _android_manifest_deps + [
1540 ":$process_resources_target", 1540 ":$process_resources_target",
1541 ":$final_dex_target_name", 1541 ":$final_dex_target_name",
1542 ] 1542 ]
1543 incremental_deps = _android_manifest_deps + [ ":$process_resources_target" ]
1543 if (defined(invoker.deps)) { 1544 if (defined(invoker.deps)) {
1544 deps += invoker.deps 1545 deps += invoker.deps
1546 incremental_deps += invoker.deps
1545 } 1547 }
1546 1548
1547 if (defined(invoker.asset_location)) { 1549 if (defined(invoker.asset_location)) {
1548 asset_location = invoker.asset_location 1550 asset_location = invoker.asset_location
1549 1551
1550 # We don't know the exact dependencies that create the assets in 1552 # We don't know the exact dependencies that create the assets in
1551 # |asset_location|; we depend on all caller deps until a better solution 1553 # |asset_location|; we depend on all caller deps until a better solution
1552 # is figured out (http://crbug.com/433330). 1554 # is figured out (http://crbug.com/433330).
1553 if (defined(invoker.deps)) { 1555 if (defined(invoker.deps)) {
1554 deps += invoker.deps 1556 deps += invoker.deps
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 1591
1590 keystore_name = _keystore_name 1592 keystore_name = _keystore_name
1591 keystore_path = _keystore_path 1593 keystore_path = _keystore_path
1592 keystore_password = _keystore_password 1594 keystore_password = _keystore_password
1593 1595
1594 native_libs_dir = _native_libs_dir 1596 native_libs_dir = _native_libs_dir
1595 deps = [ 1597 deps = [
1596 ":${_template_name}__prepare_native", 1598 ":${_template_name}__prepare_native",
1597 ":${_manifest_rule}", 1599 ":${_manifest_rule}",
1598 ] 1600 ]
1601 incremental_deps = deps
1599 } 1602 }
1600 } 1603 }
1601 1604
1602 _create_incremental_script_rule_name = "${_template_name}__incremental_script" 1605 _create_incremental_script_rule_name = "${_template_name}__incremental_script"
1603 _incremental_final_deps += [ ":${_create_incremental_script_rule_name}" ] 1606 _incremental_final_deps += [ ":${_create_incremental_script_rule_name}" ]
1604 action(_create_incremental_script_rule_name) { 1607 action(_create_incremental_script_rule_name) {
1605 script = "//build/android/incremental_install/create_install_script.py" 1608 script = "//build/android/incremental_install/create_install_script.py"
1606 depfile = "$target_gen_dir/$target_name.d" 1609 depfile = "$target_gen_dir/$target_name.d"
1607 deps = [ 1610 deps = [
1608 ":$build_config_target", 1611 ":$build_config_target",
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 2034
2032 # TODO(GYP): implement this. 2035 # TODO(GYP): implement this.
2033 template("uiautomator_test") { 2036 template("uiautomator_test") {
2034 set_sources_assignment_filter([]) 2037 set_sources_assignment_filter([])
2035 forward_variables_from(invoker, [ "testonly" ]) 2038 forward_variables_from(invoker, [ "testonly" ])
2036 assert(target_name != "") 2039 assert(target_name != "")
2037 assert(invoker.deps != [] || true) 2040 assert(invoker.deps != [] || true)
2038 group(target_name) { 2041 group(target_name) {
2039 } 2042 }
2040 } 2043 }
OLDNEW
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698