android envsetup: Stop exporting (and honoring) ANDROID_SDK_VERSION.

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 9e2bfbca13cef67c3a44bd99fd88029441bf5749..1b1e90f3a6877b46d666283169b3ba4ec8f8c58b 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -117,11 +117,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
@@ -157,12 +152,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

[Nico, 2014/02/11 01:13:45]

Is this intentionally less than what the sdk build uses?

[Torne, 2014/02/11 10:43:51]

No, it's just not been updated. It doesn't matter very much as we don't link
against the SDK framework jar; we just use a couple of tools out of it. I would
like to completely remove all references to the NDK and SDK from the WebView
build, but haven't been able to do this yet.

[Nico, 2014/02/13 23:27:30]

Oh cool. For now, if it doesn't matter much, should this line just be deleted so
that the webview build uses the same sdk version as the non-webview android
build? (Not necessarily in this CL.)

Also, since you say the webview build doesn't use the ndk in
https://codereview.chromium.org/11886053/ , I suppose the ANDROID_NDK_ROOT line
can go away too?

 
   # 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
 
@@ -191,7 +186,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"