- Android SDK tools 24.1.2 -> 24.3
- Android Support Library 22.1 -> 22.2
- Modify ctype.h headers to test for non-GNU inline semantics correctly
- Upgrade Android NDK to r10e.

BUG=None

Review URL: https://codereview.chromium.org/1161933005

Cr-Original-Commit-Position: refs/heads/master@{#332323}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a9d97645e8bfbf0b60fd667a504f2740aadc553f
This commit is contained in:
aurimas 2015-06-01 19:05:29 -07:00 коммит произвёл Commit bot
Родитель dc8f6e9f48
Коммит 0e3a6c3be2
2 изменённых файлов: 9 добавлений и 1 удалений

Просмотреть файл

@ -91,7 +91,7 @@ if (is_android) {
# Subdirectories inside android_ndk_root that contain the sysroot for the
# associated platform.
_android_api_level = 14
_android_api_level = 16
x86_android_sysroot_subdir =
"platforms/android-${_android_api_level}/arch-x86"
arm_android_sysroot_subdir =

Просмотреть файл

@ -65,9 +65,17 @@ android_java_prebuilt("android_support_v7_mediarouter_java") {
jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
}
android_resources("android_support_v7_recyclerview_resources") {
v14_skip = true
resource_dirs =
[ "$android_sdk_root/extras/android/support/v7/recyclerview/res" ]
custom_package = "android.support.v7.recyclerview"
}
android_java_prebuilt("android_support_v7_recyclerview_java") {
deps = [
":android_support_v7_appcompat_java",
":android_support_v7_recyclerview_resources",
]
jar_path = "$android_sdk_root/extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar"
}