Merging under test java into instrumentation test java.

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 194c494ff19aa9c51f5657d49245cadad18cc7f6..740d7d9cdb87158d87877a2c7fe91f66ffa655e9 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -225,6 +225,12 @@ template("write_build_config") {
         "--tested-apk-config",
         rebase_path(apk_under_test_config, root_build_dir),
       ]
+      if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
+        # If ProGuard is on, we should merge the java code of the apk under test
+        # into the test apk. This is to ensure that ProGuard doesn't optimize
+        # away any code that the tests rely on.
+        args += [ "--merge-tested-apk" ]

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

nit: write_build_config already has both proguard_enabled and --tested_apk
passed to it. No need to add this flag.

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

Done.

+      }
     }
 
     if (is_android_assets) {