Roll Android SDK in android_tools repo to api version 16.

build/install-build-deps-android-sdk.sh

 #!/bin/bash -x
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -e
 
 # The script is to install Android SDK, NDK for build chromium on Android, and
 # doesn't need to run as root.
 
 # Using Android 4.0, API Level: 14 (ice cream sandwich). The SDK package is
 # about 25M.
 SDK_TARGET_VER=20
 
 SDK_FILE_NAME="android-sdk_r${SDK_TARGET_VER}-linux.tgz"

[Yaron, 2012/08/04 00:57:51]

Just remove this file instead (and update build bot script accordingly)

[Yaron, 2012/08/06 16:29:04]

Hmm. Although this also installs the custom 64-bit linker. I assume we still
need it so maybe just revert the installation of SDK right now.

 SDK_DOWNLOAD_URL="http://dl.google.com/android/${SDK_FILE_NAME}"

[shashi, 2012/08/04 01:12:01]

Perhaps we can remove SDK_DOWNLOAD_URL and SDK_MD5SUM.

 SDK_MD5SUM="22a81cf1d4a951c62f71a8758290e9bb"
 
 # Using "ANDROID_SDK_ROOT/tools/android list targets" to get the matching target
 # id which will be loaded in simulator for testing.
 # For example: the output of the listed the target could be below, and the
 # 'android-13' is the SDK_TARGET_ID in this case.
 # id: 9 or "android-13"
 #     Name: Android 3.2
 #     Type: Platform
 #     API level: 13
 #     Revision: 1
 #     Skins: WXGA (default)
-SDK_TARGET_ID=android-15
+SDK_TARGET_ID=android-16
 
 # Using NDK r7; The package is about 64M.
 # *** DO NOT UPDATE THE NDK without updating the 64-bit linker changes ***
 # *** at the end of this file ***
 NDK_FILE_NAME="android-ndk-r7-linux-x86.tar.bz2"
 NDK_DOWNLOAD_URL="http://dl.google.com/android/ndk/${NDK_FILE_NAME}"

[shashi, 2012/08/04 01:12:01]

Same for this.

 NDK_MD5SUM="bf15e6b47bf50824c4b96849bf003ca3"
 
 # The temporary directory used to store the downloaded file.
 TEMPDIR=$(mktemp -d)
 cleanup() {
   local status=${?}
   trap - EXIT
   rm -rf "${TEMPDIR}"
   exit ${status}
 }
@@ skipping 26 matching lines @@
     exit 1
   fi
 
   echo "Install ${local_file_name}"
   mv "${local_file_name}" "${install_path}"
   cd "${install_path}"
   tar -xf "${local_file_name}"
 }
 
 if [[ -z "${ANDROID_SDK_ROOT}" ]]; then
   echo "Please set ANDROID_SDK_ROOT to where they should installed to." >& 2

[shashi, 2012/08/04 01:12:01]

Can we also nuke this code?

   echo "For example: /usr/local/android-sdk-linux_x86" >& 2
   exit 1
 fi
 
 if [[ -z "${ANDROID_NDK_ROOT}" ]]; then
   echo "Please set ANDROID_NDK_ROOT to where they should installed to." >& 2
   echo "For example: /usr/local/android-ndk-r6b" >& 2
   exit 1
 fi
 
@@ skipping 76 matching lines @@
       if [[ ! -f "$linker_dirname/$NEW_LINKER" ]]; then
         echo "Could not copy linker"
         exit 1
       fi
     fi
   fi
 }
 
 replace_linker $LINKER_DIRNAME_1 $LINKER_BASENAME_1
 replace_linker $LINKER_DIRNAME_2 $LINKER_BASENAME_2