Creating new gn arg: enable_all_proguard_optimizations.

components/cronet/android/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 342 matching lines @@
 
   deps = [
     ":cronet_sample_apk_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   run_findbugs_override = true
   if (!is_java_debug) {
     proguard_enabled = true

[mef, 2016/07/13 15:12:07]

Should proguard_enabled be conditioned on enable_all_proguard_optimizations
here?

[smaier, 2016/07/13 15:31:16]

No - we can still proguard without all proguard optimizations on.
enable_all_proguard_optimizations is a flag to set when we want to squeeze every
last byte out of our .apk - it will typically be only for release configs.

     proguard_configs = [
       "proguard.cfg",
       "sample/javatests/proguard.cfg",
     ]
   }
 }
 
 # cronet_sample_test_apk_resources is identical to
 # cronet_sample_apk_resources. The two have to be different targets because
 # targets which are common between the "instrumentation test apk" and the
 # "tested apk" are removed from the "instrumentation test apk".
 android_resources("cronet_sample_test_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/AndroidManifest.xml"
 }
 
-instrumentation_test_apk("cronet_sample_test_apk") {
-  apk_name = "CronetSampleTest"
-  apk_under_test = ":cronet_sample_apk"
-  android_manifest = "sample/javatests/AndroidManifest.xml"
-  java_files = [
-    "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
-    "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
-  ]
+if (!enable_all_proguard_optimizations) {
+  instrumentation_test_apk("cronet_sample_test_apk") {

[mef, 2016/07/13 15:12:07]

So, if enable_all_proguard_optimizations is true, then cronet_sample_test_apk
will not build. 

This seems wrong, am I missing something?

[smaier, 2016/07/13 15:31:16]

You have this correct - again, we typically only have this on
is_official_build=true. 

[mef, 2016/07/13 16:49:40]

Just to clarify - the main purpose of cronet_sample_test_apk is to ensure that
fully optimized/proguarded Cronet in CronetSample is functional despite
obfuscations and removals.

Disabling this test when proguard optimizations are enabled defeats this
purpose.

[smaier, 2016/07/13 18:13:31]

Agreed - this helped us discover an issue with when we were distributing our
"test specific" flags. We won't be changing any Cronet code for this change, as
I believe is the more correct thing to do in this case.

+    apk_name = "CronetSampleTest"
+    apk_under_test = ":cronet_sample_apk"
+    android_manifest = "sample/javatests/AndroidManifest.xml"
+    java_files = [
+      "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
+      "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
+    ]
 
-  deps = [
-    ":cronet_api",
-    ":cronet_java",
-    ":cronet_sample_apk_java",
-    ":cronet_sample_test_apk_resources",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//net/android:net_java_test_support",
-  ]
-  additional_apks = [ "//net/android:net_test_support_apk" ]
+    deps = [
+      ":cronet_api",
+      ":cronet_java",
+      ":cronet_sample_apk_java",
+      ":cronet_sample_test_apk_resources",
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//net/android:net_java_test_support",
+    ]
+    additional_apks = [ "//net/android:net_test_support_apk" ]
 
-  run_findbugs_override = true
-  proguard_enabled = !is_java_debug
+    run_findbugs_override = true
+    proguard_enabled = !is_java_debug

[mef, 2016/07/13 15:12:07]

Should proguard_enabled be conditioned on enable_all_proguard_optimizations
here?

[smaier, 2016/07/13 15:31:16]

Added an assert in config.gni to ensure sanity here.

+  }
 }
 
 generate_jni("cronet_tests_jni_headers") {
   testonly = true
   sources = [
     "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
     "test/src/org/chromium/net/CronetTestUtil.java",
     "test/src/org/chromium/net/MockCertVerifier.java",
     "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
     "test/src/org/chromium/net/NativeTestServer.java",
@@ skipping 480 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }