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

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

Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: jbudorick@'s Created 5 years, 3 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 | « no previous file | build/android/pylib/instrumentation/test_jar.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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 189 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
190 'third_party/android_tools/ndk') 190 'third_party/android_tools/ndk')
191 191
192 PROGUARD_SCRIPT_PATH = os.path.join( 192 PROGUARD_SCRIPT_PATH = os.path.join(
193 ANDROID_SDK_ROOT, 'tools', 'proguard', 'bin', 'proguard.sh') 193 ANDROID_SDK_ROOT, 'tools', 'proguard', 'bin', 'proguard.sh')
194 194
195 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT', 195 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
196 os.path.join(DIR_SOURCE_ROOT, 196 os.path.join(DIR_SOURCE_ROOT,
197 'android_emulator_sdk')) 197 'android_emulator_sdk'))
198 198
199 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'proguard')
200
199 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, 201 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
200 os.environ.get('CHROMIUM_OUT_DIR', 'out'), 202 os.environ.get('CHROMIUM_OUT_DIR', 'out'),
201 'bad_devices.json') 203 'bad_devices.json')
202 204
203 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com' 205 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
204 206
205 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop' 207 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
206 208
207 PYTHON_UNIT_TEST_SUITES = { 209 PYTHON_UNIT_TEST_SUITES = {
208 'pylib_py_unittests': { 210 'pylib_py_unittests': {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 301 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
300 return 'adb' 302 return 'adb'
301 except OSError: 303 except OSError:
302 logging.debug('No adb found in $PATH, fallback to checked in binary.') 304 logging.debug('No adb found in $PATH, fallback to checked in binary.')
303 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 305 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
304 306
305 # Exit codes 307 # Exit codes
306 ERROR_EXIT_CODE = 1 308 ERROR_EXIT_CODE = 1
307 INFRA_EXIT_CODE = 87 309 INFRA_EXIT_CODE = 87
308 WARNING_EXIT_CODE = 88 310 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698