Merging under test java into instrumentation test java.

build/config/android/rules.gni

 # Copyright 2014 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/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 
 assert(is_android)
 
@@ skipping 1819 matching lines @@
         _proguard_configs += invoker.proguard_configs
       }
       assert(_proguard_configs != [])  # Mark as used.
       _proguard_target = "${_template_name}__proguard"
       proguard(_proguard_target) {
         forward_variables_from(invoker,
                                [
                                  "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",
             "${invoker.apk_under_test}__proguard",
           ]
           _apk_under_test_build_config =
               get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
               get_label_info(invoker.apk_under_test, "name") + ".build_config"
           _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" ]
 
       _copy_proguard_mapping_target = "${_template_name}__copy_proguard_mapping"
       copy(_copy_proguard_mapping_target) {
         sources = [
           "$_proguard_output_jar_path.mapping",
         ]
         outputs = [
@@ skipping 784 matching lines @@
         android_manifest = "${_output_path}/AndroidManifest.xml"
         v14_skip = true
       }
     }
 
     java_group(target_name) {
       deps = _sub_target_names
     }
   }
 }