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 2271 matching lines @@
       deps += [ "//testing/android/broker:broker_java" ]
       data_deps += [
         "//testing/android/driver:driver_apk",
         "//tools/android/forwarder2",
         "//tools/android/md5sum",
       ]
       if (defined(invoker.additional_apks)) {
         data_deps += invoker.additional_apks
       }
 
+      if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
+        # When ProGuard is on, we use ProGuard to combine the under test java
+        # code and the test java code. This is to allow us to apply all ProGuard
+        # optimizations that we ship with, but not have them break tests. The
+        # apk under test will still have the same resources, assets, and
+        # manifest, all of which are the ones used in the tests.
+        proguard_configs = [ "//testing/android/proguard_for_test.flags" ]
+      }
+
       create_dist_ijar = true
       if (defined(invoker.run_findbugs_override)) {
         # Only allow findbugs when there are java files.
         run_findbugs_override =
             invoker.run_findbugs_override && defined(invoker.java_files)
       }
     }
 
     group(target_name) {
       public_deps = [
@@ skipping 361 matching lines @@
         android_manifest = "${_output_path}/AndroidManifest.xml"
         v14_skip = true
       }
     }
 
     java_group(target_name) {
       deps = _sub_target_names
     }
   }
 }