android: Point EMULATOR_SDK_ROOT to a location inside the repository.

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 724bb7184bcb489b6cf81f93826c7d9b6da0cf8a..d63753ca98ffc6e15ae3f235fb1c059118c7aaea 100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -31,10 +31,9 @@ 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():
@@ -43,9 +42,8 @@ def CheckX86Image():
   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():
@@ -90,8 +88,8 @@ def GetX86Image():
     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')