diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-08-19 19:23:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-20 02:24:45 +0000 |
| commit | 0d414de1c4a951509b5e8a0fc75e8dbba4c0e22b (patch) | |
| tree | 1072286f54675f41ee524554423ef0dc79ecc4f8 /build/config/android/config.gni | |
| parent | e871179436fb726cadd4f0941531cda23ac6f58c (diff) | |
| download | chromium_src-0d414de1c4a951509b5e8a0fc75e8dbba4c0e22b.zip chromium_src-0d414de1c4a951509b5e8a0fc75e8dbba4c0e22b.tar.gz chromium_src-0d414de1c4a951509b5e8a0fc75e8dbba4c0e22b.tar.bz2 | |
[Android] Roll android_tools to Android M SDK.
Partially stolen from https://codereview.chromium.org/1297273003/
Android SDK tools 24.3.3 -> 24.3.4
Android Platform tools 22 -> 23
Android SDK build tools 22 -> 23
Android SDK 5.1.1 (API 22) -> 6.0 (API 23)
Android Support Library -> 23.0.0
This also rolls:
Reland x86 toolchain from NDK r10e with a fix of "-mstackrealign" flag.
Add GCM to the Google Play Services Library.
BUG=522182,521527
TBR=sievers@chromium.org
NOTRY=true
patch from issue 1297273003 at patchset 60001 (http://crrev.com/1297273003#ps60001)
Review URL: https://codereview.chromium.org/1297023003
Cr-Commit-Position: refs/heads/master@{#344409}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 353bef8..8fe60ed 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -16,8 +16,8 @@ if (is_android) { if (!defined(default_android_sdk_root)) { default_android_sdk_root = "//third_party/android_tools/sdk" - default_android_sdk_version = "22" - default_android_sdk_build_tools_version = "22.0.0" + default_android_sdk_version = "23" + default_android_sdk_build_tools_version = "23.0.0" } if (!defined(google_play_services_library)) { |