diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 16:59:48 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 16:59:48 +0000 |
| commit | c59b6315e6eccd34ee9955725441e0bb9309c49f (patch) | |
| tree | 2e609caa0e4173a03da601381685a58e0445bbc2 /build/android | |
| parent | a23d71416c05939490802ca2f88257db917f107c (diff) | |
| download | chromium_src-c59b6315e6eccd34ee9955725441e0bb9309c49f.zip chromium_src-c59b6315e6eccd34ee9955725441e0bb9309c49f.tar.gz chromium_src-c59b6315e6eccd34ee9955725441e0bb9309c49f.tar.bz2 | |
android envsetup: Stop exporting (and honoring) ANDROID_SDK_VERSION.
If someone wants to use a custom android sdk version, they now need to set
the android_sdk_version gyp define instead of this env var.
(Depends on one internal change to an internal bot that currently sets the
env var: https://chrome-internal-review.googlesource.com/154255)
BUG=330631
Review URL: https://codereview.chromium.org/159463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index b1db6df..2a89cc8 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -108,11 +108,6 @@ sdk_build_init() { if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/" fi - if [[ -z "${ANDROID_SDK_VERSION}" ]]; then - export ANDROID_SDK_VERSION=19 - else - sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}" - fi if [[ -z "${ANDROID_SDK_ROOT}" || ! -d "${ANDROID_SDK_ROOT}" ]]; then export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" else @@ -148,12 +143,12 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}" ############################################################################# webview_build_init() { # Use the latest API in the AOSP prebuilts directory (change with AOSP roll). - export ANDROID_SDK_VERSION=18 + android_sdk_version=18 # For the WebView build we always use the NDK and SDK in the Android tree. export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/8 export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\ -${ANDROID_SDK_VERSION} +${android_sdk_version} common_vars_defines @@ -173,7 +168,7 @@ ${ANDROID_SDK_VERSION} DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}" DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}" DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}" - DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}" + DEFINES+=" android_sdk_version=${android_sdk_version}" DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then DEFINES+=" logging_like_official_build=1" |