Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3344)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/pylib/constants.py

Issue 25675010: android: Use a separate SDK for the emulator again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/android/install_emulator_deps.py ('K') | « build/android/install_emulator_deps.py ('k') | build/android/pylib/utils/emulator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/constants.py
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index 4d861bc3f5f0158f80aad40305b19faf7ea61134..b476d8fb1e5129ffdc1d0bbc1727f10f7bea2dfa 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -13,8 +13,6 @@ 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))
CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
DIR_SOURCE_ROOT, 'chrome', 'android')
@@ -120,6 +118,8 @@ ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
'third_party/android_tools/ndk')
+EMULATOR_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'android_emulator_sdk')
+
UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
« build/android/install_emulator_deps.py ('K') | « build/android/install_emulator_deps.py ('k') | build/android/pylib/utils/emulator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698