build/common.gypi - Issue 21977003: Build changes for updating Android SDK to 4.3.

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/common.gypi

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Turns out we need ANDROID_SDK_VERSION in constants.py (findbugs uses it). Created 7 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:

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 7cbe6b206cb2c0532f7158ceeebfe396805ef756..2f14c2647a0222228a347e8f3d5c69a63dadd8c6 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1216,12 +1216,15 @@

'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/',

'android_host_arch%': '<!(uname -m)',

# Android API-level of the SDK used for compilation.

- 'android_sdk_version%': '17',

+ 'android_sdk_version%': '<!(/bin/echo -n ${ANDROID_SDK_VERSION})',

+ # Android SDK build tools (e.g. dx, aapt, aidl)

+ 'android_sdk_tools%': '<!(/bin/echo -n ${ANDROID_SDK_TOOLS})',

# Copy conditionally-set variables out one scope.

'android_ndk_root%': '<(android_ndk_root)',

'android_sdk_root%': '<(android_sdk_root)',

'android_sdk_version%': '<(android_sdk_version)',

+ 'android_sdk_tools%': '<(android_sdk_tools)',

'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',

'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',

@@ -1267,7 +1270,7 @@

'android_ndk_include': '<(android_ndk_sysroot)/usr/include',

'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',

- 'android_sdk_tools%': '<(android_sdk_root)/platform-tools',

+ 'android_sdk_tools%': '<(android_sdk_tools)',

'android_sdk%': '<(android_sdk)',

'android_sdk_jar%': '<(android_sdk)/android.jar',

« no previous file with comments | « build/android/pylib/constants.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »