Android: renames pylib.constants.CHROME_DIR to DIR_SOURCE_ROOT.

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 f63414e2c859e8c9ffd84a49ed8212c91da5c6aa..18061314b0e6ca0d47b5a428729d24b2992941c2 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -7,9 +7,11 @@
 import os
 
 
-CHROME_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                          os.pardir, os.pardir, os.pardir))
-EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(CHROME_DIR, os.pardir,
+DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                               os.pardir, os.pardir, os.pardir))
+# TODO(bulach): remove this.

[Paweł Hajdan Jr., 2013/06/04 19:01:11]

This is totally fine for me for this CL.

Before I'd stamp https://codereview.chromium.org/14882007/ though, I'd just like
to see a CL which removes it.

[bulach, 2013/06/05 19:11:24]

as I said, the patch that removes it will come shortly after this has rolled.

+CHROME_DIR = DIR_SOURCE_ROOT
+EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir,
                                                  os.pardir))
 
 CHROME_PACKAGE = 'com.google.android.apps.chrome'
@@ -31,7 +33,7 @@ CHROMIUM_TEST_SHELL_ACTIVITY = (
     'org.chromium.chrome.testshell.ChromiumTestShellActivity')
 CHROMIUM_TEST_SHELL_DEVTOOLS_SOCKET = 'chromium_testshell_devtools_remote'
 CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
-    CHROME_DIR, 'chrome', 'android')
+    DIR_SOURCE_ROOT, 'chrome', 'android')
 
 GTEST_TEST_PACKAGE_NAME = 'org.chromium.native_test'
 GTEST_TEST_ACTIVITY_NAME = 'org.chromium.native_test.ChromeNativeTestActivity'
@@ -70,10 +72,12 @@ SDK_BUILD_APKS_DIR = 'apks'
 # The directory on the device where perf test output gets saved to.
 DEVICE_PERF_OUTPUT_DIR = '/data/data/' + CHROME_PACKAGE + '/files'
 
-SCREENSHOTS_DIR = os.path.join(CHROME_DIR, 'out_screenshots')
+SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = 17
-ANDROID_SDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/sdk')
-ANDROID_NDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/ndk')
+ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
+                                'third_party/android_tools/sdk')
+ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
+                                'third_party/android_tools/ndk')
 
 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'