Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

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: Roll android_tools in src/DEPS to new SDK. 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:
View side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7cbe6b206cb2c0532f7158ceeebfe396805ef756..b057157bba2666a025982c761d8982b42398ad49 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%': '18',
+ # Android build-tools version
cjhopman 2013/08/07 18:14:25 Remove tabs.
navabi 2013/08/07 18:24:13 Done.
+ 'android_build_tools_version%': '18.0.1',
},
# 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_build_tools_version%': '<(android_build_tools_version)',
'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',
'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',
@@ -1263,11 +1266,12 @@
'android_ndk_sysroot': '<(android_ndk_sysroot)',
'android_sdk_root%': '<(android_sdk_root)',
'android_sdk_version%': '<(android_sdk_version)',
+ 'android_build_tools_version%': '<(android_build_tools_version)',
'android_toolchain%': '<(android_toolchain)',
'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_build_tools%': '<(android_sdk_root)/build-tools/<(android_build_tools_version)',
'android_sdk%': '<(android_sdk)',
'android_sdk_jar%': '<(android_sdk)/android.jar',

Powered by Google App Engine
This is Rietveld 408576698