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

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

Issue 2123753005: Creating new gn arg: enable_all_proguard_optimizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing from 2 apks to gn arg which controls optimizations Created 4 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 side-by-side diff with in-line comments
Download patch
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 381016414c43ff23d9eaaefea394b6e7802e436d..a6d55b62e32e51d400b6815259fca0f2d4f76f2b 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1839,6 +1839,7 @@ if (enable_java_templates) {
if (defined(invoker.proguard_configs)) {
_proguard_configs += invoker.proguard_configs
}
+ assert(_proguard_configs != []) # Mark as used.
agrieve 2016/07/08 14:26:20 still necessary?
_proguard_target = "${_template_name}__proguard"
proguard(_proguard_target) {
forward_variables_from(invoker,
@@ -1851,6 +1852,9 @@ if (enable_java_templates) {
":$java_target",
":$process_resources_target",
]
+ if (!enable_all_proguard_optimizations) {
+ _proguard_configs += [ "//testing/android/proguard_for_test.flags" ]
+ }
inputs = [
_build_config,
_jar_path,

Powered by Google App Engine
This is Rietveld 408576698