Merging under test java into instrumentation test java.

build/config/android/internal_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/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
@@ skipping 207 matching lines @@
       deps += [ "${invoker.apk_under_test}__build_config" ]
       apk_under_test_gen_dir =
           get_label_info(invoker.apk_under_test, "target_gen_dir")
       apk_under_test_name = get_label_info(invoker.apk_under_test, "name")
       apk_under_test_config =
           "$apk_under_test_gen_dir/$apk_under_test_name.build_config"
       args += [
         "--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) {
       if (defined(invoker.asset_sources)) {
         _rebased_asset_sources =
             rebase_path(invoker.asset_sources, root_build_dir)
         args += [ "--asset-sources=$_rebased_asset_sources" ]
       }
       if (defined(invoker.asset_renaming_sources)) {
         _rebased_asset_renaming_sources =
@@ skipping 2323 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }