Fix cronet instrumentation test listing and disable optimization temporarily.

By stripping out META-INF from the test dist_jar(). Turbine was adding
in .class files there, which were confusing proguard.

Also R8's stripping caused test failure. Temporarily disable the
optimization until the next R8 roll fixes the issue.

Bug: 1081443, 1082809
Change-Id: I60676c1f654e8a0d6244493402e51f26ee1de701
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209288Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770270}

build/config/android/rules.gni

@@ -1623,9 +1623,17 @@ if (enable_java_templates) {
           args += [ "--input-zips=@FileArg($_rebased_build_config:deps_info:java_runtime_classpath)" ]
         }
       }
+      _excludes = []
       if (defined(invoker.jar_excluded_patterns)) {
-        args +=
-            [ "--input-zips-excluded-globs=${invoker.jar_excluded_patterns}" ]
+        _excludes += invoker.jar_excluded_patterns
+      }
+      if (_use_interface_jars) {
+        # Turbine adds files like: META-INF/TRANSITIVE/.../Foo.class
+        # These confuse proguard: https://crbug.com/1081443
+        _excludes += [ "META-INF/*" ]
+      }
+      if (_excludes != []) {
+        args += [ "--input-zips-excluded-globs=$_excludes" ]
       }
     }
   }

components/cronet/android/test/proguard.cfg

 # Proguard configuration that is common for all type of tests.
 
+# R8's shriking (unreachable-code removal) may remove exception handling and break
+# tests. TODO(crbug.com/1082809): re-enable once the R8 roll fixes the issue.
+-dontoptimize
+
 -keepattributes Signature,InnerClasses,SourceFile,LineNumberTable,EnclosingMethod
 -dontwarn io.netty.**
 -keep class io.netty.** { *; }