android: Point EMULATOR_SDK_ROOT to a location inside the repository.

build/android/pylib/constants.py

Index: build/android/pylib/constants.py
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index 15aebaba5e011b88742de9b7f6d436caa922a605..c5d786166c0a607e9002bbd953350897faf1f2df 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -13,8 +13,8 @@ import sys
 DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                                os.pardir, os.pardir, os.pardir))
 ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')
-EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir,
-                                                 os.pardir))
+EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT,
+                                                 'third_party'))

[Peter Beverloo, 2013/09/09 14:05:50]

This probably needs 'android_tools' and 'sdk' as arguments as well?

[Raphael Kubo da Costa (rakuco), 2013/09/09 14:08:04]

Not really; the places which still reference EMULATOR_SDK_ROOT append
['android_tools', 'sdk'] themselves.

[bulach, 2013/09/09 18:59:52]

would suggest change this to point to android_tools/sdk and remove the places
where this is being appended.. :)

 
 # TODO(craigdh): Remove these once references have been removed downstream.
 CHROME_PACKAGE = 'com.google.android.apps.chrome'