Merging under test java into instrumentation test java.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 35be87bd3d76bd25c55bcf65a4b5c27264f05b10..f28bb31a05ff1609b2af2611948130a683e42fdc 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1837,23 +1837,12 @@ if (enable_java_templates) {
                                  "alternative_android_sdk_jar",
                                  "proguard_jar_path",
                                ])
+        args = []
         deps = [
           ":$build_config_target",
           ":$java_target",
           ":$process_resources_target",
         ]
-        inputs = [
-                   _build_config,
-                   _jar_path,
-                 ] + _proguard_configs
-
-        output_jar_path = _proguard_output_jar_path
-        _rebased_proguard_configs =
-            rebase_path(_proguard_configs, root_build_dir)
-        args = [
-          "--proguard-configs=$_rebased_proguard_configs",
-          "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
-        ]
         if (defined(invoker.apk_under_test)) {
           deps += [
             "${invoker.apk_under_test}__build_config",
@@ -1865,7 +1854,21 @@ if (enable_java_templates) {
           _rebased_apk_under_test_build_config =
               rebase_path(_apk_under_test_build_config, root_build_dir)
           args += [ "--tested-apk-info=@FileArg($_rebased_apk_under_test_build_config:deps_info:proguard_info)" ]
+          _proguard_configs += [ "//testing/android/proguard_for_test.flags" ]

[agrieve, 2016/07/28 01:30:58]

nit: It might be nicer to add this in via instrumentation_test_apk

instrumentation_apk() is probably also a good spot to add a comment to explain
that when proguard is enabled, the test apk contains all the java code, but the
apk under test contains resources, assets & manifest.

as an aside - I remembered what dalvik didn't like about our previous R.class
change. It just doesn't like when a class in classloader A resolves a class from
classloader B. This change moves everything to classloader B, so there's never a
case where classloader A even gets its code run.

[smaier, 2016/07/28 15:27:19]

Done.

         }
+
+        inputs = [
+                   _build_config,
+                   _jar_path,
+                 ] + _proguard_configs
+
+        output_jar_path = _proguard_output_jar_path
+        _rebased_proguard_configs =
+            rebase_path(_proguard_configs, root_build_dir)
+        args += [
+          "--proguard-configs=$_rebased_proguard_configs",
+          "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
+        ]
       }
       _dex_sources = [ _proguard_output_jar_path ]
       _dex_deps = [ ":$_proguard_target" ]