Skip to content

Commit

Permalink
Roll to Android SDK 19 and build-tools 19.0.0.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
navabi@google.com committed Nov 14, 2013
1 parent b673a59 commit 724d9e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/android/envsetup_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/android/pylib/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

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,
Expand Down

0 comments on commit 724d9e7

Please sign in to comment.