build/android/pylib/instrumentation/test_jar.py - Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party.

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/pylib/instrumentation/test_jar.py

Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert changes in progard.flags Created 5 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/pylib/instrumentation/test_jar.py

diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py

index 7ad8997755cc2c49763a51a946adb05604e21b19..a6dcb43136b13561ec8b2204459f636dd625b69c 100644

--- a/build/android/pylib/instrumentation/test_jar.py

+++ b/build/android/pylib/instrumentation/test_jar.py

@@ -45,8 +45,8 @@ class TestJar(object):

if not os.path.exists(jar_path):

raise Exception('%s not found, please build it' % jar_path)

- self._PROGUARD_PATH = os.path.join(constants.ANDROID_SDK_ROOT,

- 'tools/proguard/lib/proguard.jar')

+ self._PROGUARD_PATH = os.path.join(constants.PROGUARD_ROOT,

+ 'lib/proguard.jar')

jbudorick 2015/08/27 20:10:26 Hm, why are we using 'paths/with/slashes' inside j

if not os.path.exists(self._PROGUARD_PATH):

self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'],

'external/proguard/lib/proguard.jar')

« build/android/pylib/constants/__init__.py ('K') | « build/android/pylib/constants/__init__.py ('k') | build/android/pylib/utils/proguard.py » ('j') | no next file with comments »