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

Side by Side Diff: build/android/pylib/constants/__init__.py

Issue 1341503002: fix emulator.py by using Android SDK in third_party/android_tools instead of downloading adt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing logging error Created 5 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 unified diff | Download patch
« no previous file with comments | « build/android/install_emulator_deps.py ('k') | build/android/pylib/utils/emulator.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Defines a set of constants shared by test runners and other scripts.""" 5 """Defines a set of constants shared by test runners and other scripts."""
6 6
7 # TODO(jbudorick): Split these constants into coherent modules. 7 # TODO(jbudorick): Split these constants into coherent modules.
8 8
9 # pylint: disable=W0212 9 # pylint: disable=W0212
10 10
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 160 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
161 'third_party', 'android_tools', 'sdk') 161 'third_party', 'android_tools', 'sdk')
162 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, 162 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
163 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION) 163 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
164 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 164 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
165 'third_party', 'android_tools', 'ndk') 165 'third_party', 'android_tools', 'ndk')
166 166
167 PROGUARD_SCRIPT_PATH = os.path.join( 167 PROGUARD_SCRIPT_PATH = os.path.join(
168 ANDROID_SDK_ROOT, 'tools', 'proguard', 'bin', 'proguard.sh') 168 ANDROID_SDK_ROOT, 'tools', 'proguard', 'bin', 'proguard.sh')
169 169
170 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
171 os.path.join(DIR_SOURCE_ROOT,
172 'android_emulator_sdk'))
173
174 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'proguard') 170 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'proguard')
175 171
176 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, 172 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
177 os.environ.get('CHROMIUM_OUT_DIR', 'out'), 173 os.environ.get('CHROMIUM_OUT_DIR', 'out'),
178 'bad_devices.json') 174 'bad_devices.json')
179 175
180 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com' 176 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
181 177
182 # TODO(jbudorick): Remove once unused. 178 # TODO(jbudorick): Remove once unused.
183 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop' 179 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 275 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
280 return 'adb' 276 return 'adb'
281 except OSError: 277 except OSError:
282 logging.debug('No adb found in $PATH, fallback to checked in binary.') 278 logging.debug('No adb found in $PATH, fallback to checked in binary.')
283 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 279 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
284 280
285 # Exit codes 281 # Exit codes
286 ERROR_EXIT_CODE = 1 282 ERROR_EXIT_CODE = 1
287 INFRA_EXIT_CODE = 87 283 INFRA_EXIT_CODE = 87
288 WARNING_EXIT_CODE = 88 284 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « 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