android: Remove GetSDK() from install_emulator_deps.

build/android/install_emulator_deps.py

Index: build/android/install_emulator_deps.py
diff --git a/build/android/install_emulator_deps.py b/build/android/install_emulator_deps.py
index 7b122236266a3683319ae1810880431c5e869b7e..d68f019309c049928a1e8f3f8b648afa6d112c0e 100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -19,10 +19,6 @@ from pylib import cmd_helper
 from pylib import constants
 from pylib.utils import run_tests_helper
 
-# From the Android Developer's website.
-SDK_BASE_URL = 'http://dl.google.com/android/adt'
-SDK_ZIP = 'adt-bundle-linux-x86_64-20130522.zip'
-
 # Android x86 system image from the Intel website:
 # http://software.intel.com/en-us/articles/intel-eula-x86-android-4-2-jelly-bean-bin
 X86_IMG_URL = 'http://download-software.intel.com/sites/landingpage/android/sysimg_x86-17_r01.zip'
@@ -65,27 +61,6 @@ def CheckKVM():
     return False
 
 
-def GetSDK():
-  """Download the SDK and unzip in android_tools directory."""
-  logging.info('Download Android SDK.')
-  sdk_url = '%s/%s' % (SDK_BASE_URL, SDK_ZIP)
-  try:
-    cmd_helper.RunCmd(['curl', '-o', '/tmp/sdk.zip', sdk_url])
-    print 'curled unzipping...'
-    rc = cmd_helper.RunCmd(['unzip', '-o', '/tmp/sdk.zip', '-d', '/tmp/'])
-    if rc:
-      logging.critical('ERROR: could not download/unzip Android SDK.')
-      raise
-    # Get the name of the sub-directory that everything will be extracted to.
-    dirname, _ = os.path.splitext(SDK_ZIP)
-    zip_dir = '/tmp/%s' % dirname
-    # Move the extracted directory to EMULATOR_SDK_ROOT
-    dst = os.path.join(constants.EMULATOR_SDK_ROOT, 'android_tools')
-    shutil.move(zip_dir, dst)
-  finally:
-    os.unlink('/tmp/sdk.zip')
-
-
 def InstallKVM():
   """Installs KVM packages."""
   rc = cmd_helper.RunCmd(['sudo', 'apt-get', 'install', 'kvm'])
@@ -128,10 +103,10 @@ def main(argv):
   run_tests_helper.SetLogLevel(verbose_count=1)
 
   # Calls below will download emulator SDK and/or system images only if needed.

[Peter Beverloo, 2013/09/09 17:36:11]

nit: this comment no longer is accurate.

[bulach, 2013/09/09 18:58:27]

yeah, but the x86 below in 112 would still need this comment, perhaps just move
to 112?

-  if CheckSDK():
-    logging.info('android_tools directory already exists (not downloading).')
-  else:
-    GetSDK()
+  if not CheckSDK():
+    logging.critical('ERROR: android_tools does not exist. Make sure your '
+                     '.gclient file is correct.')

[Peter Beverloo, 2013/09/09 17:36:11]

nit: perhaps we can link to the Android build instructions here? It specifically
is the target_os rule which someone must add:

https://code.google.com/p/chromium/wiki/AndroidBuildInstructions

+    return 1
 
   logging.info('Emulator deps for ARM emulator complete.')