android: Point EMULATOR_SDK_ROOT to a location inside the repository.

build/android/install_emulator_deps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Installs deps for using SDK emulator for testing.
 
 The script will download system images, if they are not present, and
 install and enable KVM, if virtualization has been enabled in the BIOS.
 """
@@ skipping 13 matching lines @@
 X86_IMG_URL = 'http://download-software.intel.com/sites/landingpage/android/sysimg_x86-17_r01.zip'
 
 # Android API level
 API_TARGET = 'android-%s' % constants.ANDROID_SDK_VERSION
 
 
 def CheckSDK():
   """Check if SDK is already installed.
 
   Returns:
-    True if android_tools directory exists in current directory.
+    True if the third_party/android_tools/sdk directory exists.
   """
-  return os.path.exists(os.path.join(constants.EMULATOR_SDK_ROOT,
-                                     'android_tools'))
+  return os.path.exists(constants.ANDROID_SDK_ROOT)
 
 
 def CheckX86Image():
   """Check if Android system images have been installed.
 
   Returns:
     True if android_tools/sdk/system-images directory exists.
   """
-  return os.path.exists(os.path.join(constants.EMULATOR_SDK_ROOT,
-                                     'android_tools', 'sdk', 'system-images',
-                                     API_TARGET, 'x86'))
+  return os.path.exists(os.path.join(constants.ANDROID_SDK_ROOT,
+                                     'system-images', API_TARGET, 'x86'))

[Peter Beverloo, 2013/09/11 17:29:35]

The comment doesn't match the code.

 
 
 def CheckKVM():
   """Check if KVM is enabled.
 
   Returns:
     True if kvm-ok returns 0 (already enabled)
   """
   try:
     return not cmd_helper.RunCmd(['kvm-ok'])
@@ skipping 24 matching lines @@
 
 def GetX86Image():
   """Download x86 system image from Intel's website."""
   logging.info('Download x86 system image directory into sdk directory.')
   try:
     cmd_helper.RunCmd(['curl', '-o', '/tmp/x86_img.zip', X86_IMG_URL])
     rc = cmd_helper.RunCmd(['unzip', '-o', '/tmp/x86_img.zip', '-d', '/tmp/'])
     if rc:
       logging.critical('ERROR: Could not download/unzip image zip.')
       raise
-    sys_imgs = os.path.join(constants.EMULATOR_SDK_ROOT, 'android_tools', 'sdk',
-                            'system-images', API_TARGET, 'x86')
+    sys_imgs = os.path.join(constants.ANDROID_SDK_ROOT, 'system-images',
+                            API_TARGET, 'x86')
     shutil.move('/tmp/x86', sys_imgs)
   finally:
     os.unlink('/tmp/x86_img.zip')
 
 
 def main(argv):
   logging.basicConfig(level=logging.INFO,
                       format='# %(asctime)-15s: %(message)s')
   run_tests_helper.SetLogLevel(verbose_count=1)
 
@@ skipping 15 matching lines @@
 
   # Make sure KVM packages are installed and enabled.
   if CheckKVM():
     logging.info('KVM already installed and enabled.')
   else:
     InstallKVM()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))