Creating new gn arg: enable_all_proguard_optimizations.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 75e6228e2541b9821dac54a3102a817da1ac3dc7..0afb2827aaa7aedfc500e012c872b89275c14059 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -552,24 +552,26 @@ jinja_template("chrome_sync_shell_test_apk_manifest") {
   variables = chrome_sync_shell_jinja_variables
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
-instrumentation_test_apk("chrome_public_test_apk") {
-  apk_name = "ChromePublicTest"
-  apk_under_test = ":chrome_public_apk"
-  android_manifest = chrome_public_test_apk_manifest
-  android_manifest_dep = ":chrome_public_test_apk_manifest"
+if (!enable_all_proguard_optimizations) {

[Yaron, 2016/07/12 03:40:04]

since you made the rest of the change global (i.e in the templates), could you
assert in instrumentation_test_apk that this flag isn't set and output a helpful
message?

[smaier, 2016/07/12 13:24:43]

That's the plan, but we want to ensure that we land this CL and a matching
downstream one first to avoid breaking the build.

+  # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
+  instrumentation_test_apk("chrome_public_test_apk") {
+    apk_name = "ChromePublicTest"
+    apk_under_test = ":chrome_public_apk"
+    android_manifest = chrome_public_test_apk_manifest
+    android_manifest_dep = ":chrome_public_test_apk_manifest"
 
-  deps = [
-    ":chrome_test_java",
-    "//chrome/android/webapk/shell_apk:shell_apk_javatests",
-  ]
-  additional_apks = [
-    "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
-    "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
-    "//net/android:net_test_support_apk",
-  ]
-  isolate_file = "../chrome_public_test_apk.isolate"
-  proguard_enabled = !is_java_debug
+    deps = [
+      ":chrome_test_java",
+      "//chrome/android/webapk/shell_apk:shell_apk_javatests",
+    ]
+    additional_apks = [
+      "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
+      "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
+      "//net/android:net_test_support_apk",
+    ]
+    isolate_file = "../chrome_public_test_apk.isolate"
+    proguard_enabled = !is_java_debug
+  }
 }
 
 android_library("chrome_sync_shell_test_apk_java") {
@@ -597,14 +599,16 @@ android_library("chrome_sync_shell_test_apk_java") {
   ]
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
-instrumentation_test_apk("chrome_sync_shell_test_apk") {
-  apk_name = "ChromeSyncShellTest"
-  apk_under_test = ":chrome_sync_shell_apk"
-  android_manifest = chrome_sync_shell_test_apk_manifest
-  android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
-  deps = [
-    ":chrome_sync_shell_test_apk_java",
-  ]
-  proguard_enabled = !is_java_debug
+if (!enable_all_proguard_optimizations) {
+  # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
+  instrumentation_test_apk("chrome_sync_shell_test_apk") {
+    apk_name = "ChromeSyncShellTest"
+    apk_under_test = ":chrome_sync_shell_apk"
+    android_manifest = chrome_sync_shell_test_apk_manifest
+    android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
+    deps = [
+      ":chrome_sync_shell_test_apk_java",
+    ]
+    proguard_enabled = !is_java_debug
+  }
 }