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

Unified Diff: build/common.gypi

Issue 12379078: Update ndk sysroot to API level 14 (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: update clang file Created 7 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
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 185796)
+++ build/common.gypi (working copy)
@@ -1131,11 +1131,14 @@
# Android API-level of the SDK used for compilation.
'android_sdk_version%': '17',
+ # Android API level 14 is ICS (Android 4.0) which is the minimum
+ # platform requirement for Chrome on Android, we use it for native
+ # code compilation.
'conditions': [
['target_arch == "ia32"', {
'android_app_abi%': 'x86',
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gdbserver/gdbserver',
- 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-x86',
+ 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86',
'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
['target_arch=="arm"', {
@@ -1147,7 +1150,7 @@
}],
],
'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gdbserver/gdbserver',
- 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-arm',
+ 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm',
'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
}],
],
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698