android: Point EMULATOR_SDK_ROOT to a location inside the repository.

build/android/pylib/constants.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 import collections
 import os
 import subprocess
 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(

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

This is now equal to the ANDROID_SDK_ROOT constant, can we remove
EMULATOR_SDK_ROOT?

+    DIR_SOURCE_ROOT, 'third_party', 'android_tools', 'sdk'))
 
 # TODO(craigdh): Remove these once references have been removed downstream.
 CHROME_PACKAGE = 'com.google.android.apps.chrome'
 CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'
 
 CHROME_STABLE_PACKAGE = 'com.android.chrome'
 CHROME_BETA_PACKAGE = 'com.chrome.beta'
 
 LEGACY_BROWSER_PACKAGE = 'com.google.android.browser'
 LEGACY_BROWSER_ACTIVITY = 'com.android.browser.BrowserActivity'
@@ skipping 116 matching lines @@
   except OSError:
     print >> sys.stderr, 'No adb found in $PATH, fallback to checked in binary.'
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 
 ADB_PATH = _GetADBPath()
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88