Fix SDK installer by downloading r20 directly

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

-#!/bin/bash
+#!/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_FILE_NAME="android-sdk_r18-linux.tgz"
+SDK_FILE_NAME="android-sdk_r20-linux.tgz"
 SDK_DOWNLOAD_URL="http://dl.google.com/android/${SDK_FILE_NAME}"
-SDK_MD5SUM="6cd716d0e04624b865ffed3c25b3485c"
+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
@@ skipping 40 matching lines @@
   local computed_md5=$(md5sum "${local_file_name}" | cut -d' ' -f1)
   if [[ "${computed_md5}" != "${md5}" ]]; then
     echo "Downloaded ${local_file_name} has bad md5sum, which is expected" >& 2
     echo "to be ${md5} but was ${computed_md5}" >& 2
     exit 1
   fi
 
   echo "Install ${local_file_name}"
   mv "${local_file_name}" "${install_path}"
   cd "${install_path}"
-  tar -xvf "${local_file_name}"
+  tar -xf "${local_file_name}"
 }
 
 if [[ -z "${ANDROID_SDK_ROOT}" ]]; then
   echo "Please set ANDROID_SDK_ROOT to where they should installed to." >& 2
   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
@@ skipping 30 matching lines @@
   fi
   # Updates the SDK to latest version firstly.
     "${ANDROID_SDK_ROOT}"/tools/android update sdk ${update_flag} --no-ui \
         --filter platform-tool,tool,system-image,${SDK_TARGET_ID}
 fi
 
 # Create a Android Virtual Device named 'buildbot' with default hardware
 # configuration and override the existing one, since there is no easy way to
 # check whether current AVD has correct configuration and it takes almost no
 # time to create a new one.  Create one ARM AVD and one x86 AVD.
-"${ANDROID_SDK_ROOT}/tools/android" --silent create avd --name buildbot \
+"${ANDROID_SDK_ROOT}/tools/android" --silent create avd --name avd_armeabi \
   --abi armeabi-v7a --target ${SDK_TARGET_ID} --force <<< "no"
 
-"${ANDROID_SDK_ROOT}/tools/android" --silent create avd --name buildbot \
+"${ANDROID_SDK_ROOT}/tools/android" --silent create avd --name avd_x86 \
   --abi x86 --target ${SDK_TARGET_ID} --force <<< "no"
 
 # Install Android NDK if it doesn't exist.
 if [[ ! -d "${ANDROID_NDK_ROOT}" ]]; then
   echo 'Install ANDROID NDK ...'
   (install_dev_kit "${NDK_FILE_NAME}" "${NDK_DOWNLOAD_URL}" "${NDK_MD5SUM}" \
                   $(dirname "${ANDROID_NDK_ROOT}"))
 fi
 
 # Install the 64-bit linker if needed.
@@ skipping 23 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