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 7b122236266a3683319ae1810880431c5e869b7e..ff4102c8fc602f8be5174fc2dbb0a02abe26715e 100755
--- a/build/android/install_emulator_deps.py
+++ b/build/android/install_emulator_deps.py
@@ -35,10 +35,9 @@ def CheckSDK():
   """Check if SDK is already installed.
 
   Returns:
-    True if android_tools directory exists in current directory.
+    True if the android_tools/sdk directory exists in current directory.

[Peter Beverloo, 2013/09/11 13:58:08]

nit: EMULATOR_SDK_ROOT is an absolute path, so the "in current directory"
addendum here isn't valid.

   """
-  return os.path.exists(os.path.join(constants.EMULATOR_SDK_ROOT,
-                                     'android_tools'))
+  return os.path.exists(constants.EMULATOR_SDK_ROOT)
 
 
 def CheckX86Image():
@@ -48,8 +47,7 @@ def CheckX86Image():
     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'))
+                                     'system-images', API_TARGET, 'x86'))
 
 
 def CheckKVM():
@@ -115,8 +113,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.EMULATOR_SDK_ROOT, 'system-images',
+                            API_TARGET, 'x86')
     shutil.move('/tmp/x86', sys_imgs)
   finally:
     os.unlink('/tmp/x86_img.zip')