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

Unified 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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 1c12e87a992996d4b40eb551431e9628074f4098..f77d150b9cc37b40b0c0ab408a64ed8767f6d496 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1540,8 +1540,10 @@ template("android_apk") {
":$process_resources_target",
":$final_dex_target_name",
]
+ incremental_deps = _android_manifest_deps + [ ":$process_resources_target" ]
if (defined(invoker.deps)) {
deps += invoker.deps
+ incremental_deps += invoker.deps
}
if (defined(invoker.asset_location)) {
@@ -1596,6 +1598,7 @@ template("android_apk") {
":${_template_name}__prepare_native",
":${_manifest_rule}",
]
+ incremental_deps = deps
}
}
« 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