Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3213)

Unified Diff: build/android/envsetup_functions.sh

Issue 10823174: Roll Android SDK in android_tools repo to api version 16. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix up CL since patch 4 didn't upload everything. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/envsetup.sh ('k') | build/install-build-deps-android-sdk.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 9b8083d5429c5aa1cef78ae183fa5c139dc2a0bc..0c7a2a0db821a96d1f55b0400e60e5cb4d1e25c7 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -165,8 +165,6 @@ sdk_build_init() {
# Set default target.
export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
- # Android sdk platform version to use
- export ANDROID_SDK_VERSION=15
# Unset toolchain so that it can be set based on TARGET_PRODUCT.
# This makes it easy to switch between architectures.
unset ANDROID_TOOLCHAIN
@@ -226,9 +224,6 @@ non_sdk_build_init() {
# We export "ANDROID_NDK_ROOT" for building Chromium for Android by NDK.
export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/android-ndk-r7
- # Android sdk platform version to use
- export ANDROID_SDK_VERSION=15
-
# We export "ANDROID_SDK_ROOT" for building Java source with the SDK.
export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\
${ANDROID_SDK_VERSION}
« no previous file with comments | « build/android/envsetup.sh ('k') | build/install-build-deps-android-sdk.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698