Creating new gn arg: enable_all_proguard_optimizations.

android_webview/tools/system_webview_shell/BUILD.gn

Index: android_webview/tools/system_webview_shell/BUILD.gn
diff --git a/android_webview/tools/system_webview_shell/BUILD.gn b/android_webview/tools/system_webview_shell/BUILD.gn
index 16ecb86a1645d22a13f98f850214aae17f0797a2..a474dc576cc83b1e7e52580dc45026cf56eaa38b 100644
--- a/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/android_webview/tools/system_webview_shell/BUILD.gn
@@ -11,9 +11,13 @@ testonly = true
 group("system_webview_shell") {
   deps = [
     ":system_webview_shell_apk",
-    ":system_webview_shell_layout_test_apk",
-    ":system_webview_shell_page_cycler_apk",
   ]
+  if (!enable_all_proguard_optimizations) {
+    deps += [
+      ":system_webview_shell_layout_test_apk",
+      ":system_webview_shell_page_cycler_apk",
+    ]
+  }
 }
 
 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_apk
@@ -41,38 +45,42 @@ android_resources("system_webview_shell_apk_resources") {
   custom_package = "org.chromium.webview_shell"
 }
 
-# GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_page_cycler_apk
-instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
-  apk_name = "SystemWebViewShellPageCycler"
-  apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "page_cycler/AndroidManifest.xml"
-  java_files = [
-    "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
-    "page_cycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java",
-  ]
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//content/public/android:content_java",
-    "//content/public/test/android:content_java_test_support",
-    "//testing/android/reporter:reporter_java",
-  ]
+if (!enable_all_proguard_optimizations) {
+  # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_page_cycler_apk
+  instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
+    apk_name = "SystemWebViewShellPageCycler"
+    apk_under_test = ":system_webview_shell_apk"
+    android_manifest = "page_cycler/AndroidManifest.xml"
+    java_files = [
+      "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
+      "page_cycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java",
+    ]
+    deps = [
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//content/public/android:content_java",
+      "//content/public/test/android:content_java_test_support",
+      "//testing/android/reporter:reporter_java",
+    ]
+  }
 }
 
-# GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_test_apk
-instrumentation_test_apk("system_webview_shell_layout_test_apk") {
-  apk_name = "SystemWebViewShellLayoutTest"
-  apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "layout_tests/AndroidManifest.xml"
-  java_files = [
-    "layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java",
-    "layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java",
-    "layout_tests/src/org/chromium/webview_shell/test/WebViewThreadTest.java",
-  ]
-  isolate_file = "../../system_webview_shell_test_apk.isolate"
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//testing/android/reporter:reporter_java",
-  ]
+if (!enable_all_proguard_optimizations) {

[agrieve, 2016/07/08 14:26:20]

nit: combine with previous if.

[smaier, 2016/07/08 14:50:07]

Done.

+  # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_test_apk
+  instrumentation_test_apk("system_webview_shell_layout_test_apk") {
+    apk_name = "SystemWebViewShellLayoutTest"
+    apk_under_test = ":system_webview_shell_apk"
+    android_manifest = "layout_tests/AndroidManifest.xml"
+    java_files = [
+      "layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java",
+      "layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java",
+      "layout_tests/src/org/chromium/webview_shell/test/WebViewThreadTest.java",
+    ]
+    isolate_file = "../../system_webview_shell_test_apk.isolate"
+    deps = [
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//testing/android/reporter:reporter_java",
+    ]
+  }
 }