build/android/pylib/instrumentation/test_jar.py - Issue 226453006: android envsetup: Stop exporting ANDROID_SDK_ROOT.

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 226453006: android envsetup: Stop exporting ANDROID_SDK_ROOT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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:

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 8ea3dbf550ad3497e89696b8ce1a4fa732ce3489..ee781c518ea2742bd519042450f0235fcdca1d3e 100644

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

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

@@ -41,8 +41,7 @@ class TestJar(object):

if not os.path.exists(jar_path):

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

- sdk_root = os.getenv('ANDROID_SDK_ROOT', constants.ANDROID_SDK_ROOT)

- self._PROGUARD_PATH = os.path.join(sdk_root,

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

'tools/proguard/bin/proguard.sh')

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

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

« no previous file with comments | « build/android/envsetup.sh ('k') | no next file » | no next file with comments »