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

Unified Diff: build/config/android/internal_rules.gni

Issue 2562063003: Add incremental_apk_by_default GN arg. (Closed)
Patch Set: Remove error formatting Created 4 years 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/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 48fcbc4e71891f8a8c32cedea9a369fe1570c889..53ef628aa9da47d73806d51789670816c0f725e7 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -298,9 +298,15 @@ template("write_build_config") {
rebase_path(invoker.incremental_apk_path, root_build_dir)
_rebased_incremental_install_script_path =
rebase_path(invoker.incremental_install_script_path, root_build_dir)
+ _incremental_allowed =
+ defined(invoker.incremental_allowed) && invoker.incremental_allowed
args += [ "--apk-path=$_rebased_apk_path" ]
- args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ]
args += [ "--incremental-install-script-path=$_rebased_incremental_install_script_path" ]
+
+ assert(_rebased_incremental_apk_path != "") # Mark as used.
+ if (_incremental_allowed) {
+ args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ]
+ }
}
}
@@ -560,6 +566,8 @@ template("test_runner_script") {
test_runner_args += [
"--additional-apk",
"@FileArg($_rebased_build_config:deps_info:apk_path)",
+ "--additional-apk-incremental",
+ "@FileArg($_rebased_build_config:deps_info:incremental_apk_path)",
]
}
}
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698