Merging under test java into instrumentation test java.

build/android/gyp/util/proguard_util.py

Index: build/android/gyp/util/proguard_util.py
diff --git a/build/android/gyp/util/proguard_util.py b/build/android/gyp/util/proguard_util.py
index f1449c8b9884b46f21b925afae542eeaf3ea224c..1027a684c96d1e32d443f32fb5754645a53628ce 100644
--- a/build/android/gyp/util/proguard_util.py
+++ b/build/android/gyp/util/proguard_util.py
@@ -105,18 +105,6 @@ class ProguardCmdBuilder(object):
     if self._tested_apk_info_path:
       tested_apk_info = build_utils.ReadJson(self._tested_apk_info_path)
       self._configs += tested_apk_info['configs']
-      self._injars = [
-          p for p in self._injars if not p in tested_apk_info['inputs']]
-      if not self._libraries:
-        self._libraries = []
-      self._libraries += tested_apk_info['inputs']

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

@jbudorick Removing lines 108/109 and 112 are what enables ProGuard to combine
the java code under test into the tests' java code. Previously, we told ProGuard
to treat the java code from the apk-under-test as a library we can't touch -
which isn't great when some functions the tests use are unknowingly inlined
during the ProGuard run on the apk-under-test.

-      self._mapping = tested_apk_info['mapping']
-      cmd += [
-        '-dontobfuscate',
-        '-dontoptimize',
-        '-dontshrink',
-        '-dontskipnonpubliclibraryclassmembers',
-      ]
 
     if self._mapping:
       cmd += [