build/android/pylib/constants.py - Issue 164193010: android envsetup: Use gyp defines instead of env vars for sdk root and sdk tools.

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/constants.py

Issue 164193010: android envsetup: Use gyp defines instead of env vars for sdk root and sdk tools. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sepvar Created 6 years, 10 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/constants.py

diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py

index d410335c6d5bc3a4d5c0e051360772b2a05dfc04..d3bf734bbb731f46c31282e86f6a8bd1287017c4 100644

--- a/build/android/pylib/constants.py

+++ b/build/android/pylib/constants.py

@@ -126,10 +126,11 @@ DEVICE_PERF_OUTPUT_DIR = (

SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')

ANDROID_SDK_VERSION = 19

+ANDROID_SDK_BUILD_TOOLS_VERSION = '19.0.0'

ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,

'third_party/android_tools/sdk')

ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,

- 'build-tools/%d.0.0' % ANDROID_SDK_VERSION)

+ 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)

ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,

'third_party/android_tools/ndk')

« no previous file with comments | « build/android/envsetup_functions.sh ('k') | build/common.gypi » ('j') | no next file with comments »