build/common.gypi - Issue 12524008: Android: factor out use of SDK jar.

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 12524008: Android: factor out use of SDK jar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove input_jar_file altogether. Created 7 years, 9 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 f070f4290bb2860e925877de7521867dbeff1cd5..11920ea8b847b701d1576bd8fd2c50f85eab2dc8 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1122,13 +1122,15 @@

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

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

# 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 API-level of the SDK used for compilation.

- 'android_sdk_version%': '17',

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

# Android API level 14 is ICS (Android 4.0) which is the minimum

# platform requirement for Chrome on Android, we use it for native

@@ -1166,7 +1168,8 @@

'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%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',

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

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

# Location of the "strip" binary, used by both gyp and scripts.

'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',

« no previous file with comments | « android_webview/native/webview_native.gyp ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »