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

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: Revert changes in progard.flags Created 5 years, 4 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
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'third_party/android_tools/sdk') 186 'third_party/android_tools/sdk')
187 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, 187 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
188 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION) 188 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
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 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT', 192 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
193 os.path.join(DIR_SOURCE_ROOT, 193 os.path.join(DIR_SOURCE_ROOT,
194 'android_emulator_sdk')) 194 'android_emulator_sdk'))
195 195
196 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party/proguard')
jbudorick 2015/08/27 20:10:26 nit: os.path.join(DIR_SOURCE_ROOT, 'third_party',
197
196 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, 198 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
197 os.environ.get('CHROMIUM_OUT_DIR', 'out'), 199 os.environ.get('CHROMIUM_OUT_DIR', 'out'),
198 'bad_devices.json') 200 'bad_devices.json')
199 201
200 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com' 202 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
201 203
202 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop' 204 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
203 205
204 PYTHON_UNIT_TEST_SUITES = { 206 PYTHON_UNIT_TEST_SUITES = {
205 'pylib_py_unittests': { 207 'pylib_py_unittests': {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 298 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
297 return 'adb' 299 return 'adb'
298 except OSError: 300 except OSError:
299 logging.debug('No adb found in $PATH, fallback to checked in binary.') 301 logging.debug('No adb found in $PATH, fallback to checked in binary.')
300 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 302 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
301 303
302 # Exit codes 304 # Exit codes
303 ERROR_EXIT_CODE = 1 305 ERROR_EXIT_CODE = 1
304 INFRA_EXIT_CODE = 87 306 INFRA_EXIT_CODE = 87
305 WARNING_EXIT_CODE = 88 307 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | build/android/pylib/instrumentation/test_jar.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698