Merging under test java into instrumentation test java.

build/android/gyp/util/proguard_util.py

 # Copyright 2015 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 os
 import re
 from util import build_utils
 
 
 class _ProguardOutputFilter(object):
@@ skipping 87 matching lines @@
     assert self._injars is not None
     assert self._outjar is not None
     assert self._configs is not None
     cmd = [
       'java', '-jar', self._proguard_jar_path,
       '-forceprocessing',
     ]
     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 += [
         '-applymapping', self._mapping,
       ]
 
     if self._libraries:
       cmd += [
         '-libraryjars', ':'.join(self._libraries),
       ]
@@ skipping 57 matching lines @@
                             stderr_filter=stderr_filter)
 
     this_info = {
       'inputs': self._injars,
       'configs': self._configs,
       'mapping': self._outjar + '.mapping',
     }
 
     build_utils.WriteJson(this_info, self._outjar + '.info')