build/android/gyp/util/proguard_util.py - Issue 2182303002: Merging under test java into instrumentation test java.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/gyp/util/proguard_util.py

Issue 2182303002: Merging under test java into instrumentation test java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@runtimelibrary

Patch Set: reenabling tests that this fixes Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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']

- self._mapping = tested_apk_info['mapping']

- cmd += [

- '-dontobfuscate',

- '-dontoptimize',

- '-dontshrink',

- '-dontskipnonpubliclibraryclassmembers',

- ]

if self._mapping:

cmd += [

« no previous file with comments | « base/android/base_proguard_config.flags ('k') | build/android/gyp/write_build_config.py » ('j') | no next file with comments »