diff options
| author | navabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 12:05:28 +0000 |
|---|---|---|
| committer | navabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 12:05:28 +0000 |
| commit | 724d9e77f93681b6c4d24e4c5cc0c5ac698c6641 (patch) | |
| tree | 7972ef68aa2a9694137da1b5a30b382c74d48661 /build | |
| parent | b673a5948597b48e9461add90849485cdbd9d4a9 (diff) | |
| download | chromium_src-724d9e77f93681b6c4d24e4c5cc0c5ac698c6641.zip chromium_src-724d9e77f93681b6c4d24e4c5cc0c5ac698c6641.tar.gz chromium_src-724d9e77f93681b6c4d24e4c5cc0c5ac698c6641.tar.bz2 | |
Roll to Android SDK 19 and build-tools 19.0.0.
BUG=317754
Review URL: https://codereview.chromium.org/63153014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 4 | ||||
| -rw-r--r-- | build/android/pylib/constants.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index b0bdb2a..bfd831b 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -228,7 +228,7 @@ sdk_build_init() { export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/" fi if [[ -z "${ANDROID_SDK_VERSION}" ]]; then - export ANDROID_SDK_VERSION=18 + export ANDROID_SDK_VERSION=19 else sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}" fi @@ -240,7 +240,7 @@ sdk_build_init() { sdk_defines+=" android_sdk_root=${ANDROID_SDK_ROOT}" fi if [[ -z "${ANDROID_SDK_BUILD_TOOLS_VERSION}" ]]; then - export ANDROID_SDK_BUILD_TOOLS_VERSION=18.0.1 + export ANDROID_SDK_BUILD_TOOLS_VERSION=19.0.0 fi unset ANDROID_BUILD_TOP diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py index c32474f..9ae9878 100644 --- a/build/android/pylib/constants.py +++ b/build/android/pylib/constants.py @@ -124,7 +124,7 @@ DEVICE_PERF_OUTPUT_DIR = ( SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots') -ANDROID_SDK_VERSION = 18 +ANDROID_SDK_VERSION = 19 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party/android_tools/sdk') ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, |