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

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: Update proguard.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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 'third_party/android_tools/sdk') 185 'third_party/android_tools/sdk')
186 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, 186 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
187 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION) 187 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
188 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 188 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
189 'third_party/android_tools/ndk') 189 'third_party/android_tools/ndk')
190 190
191 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT', 191 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
192 os.path.join(DIR_SOURCE_ROOT, 192 os.path.join(DIR_SOURCE_ROOT,
193 'android_emulator_sdk')) 193 'android_emulator_sdk'))
194 194
195 PROGUARD_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party/proguard')
Yaron 2015/08/25 16:57:35 You're going to have to rebase on https://coderevi
Xi Han 2015/08/25 19:14:56 I keep tracking this CL but it has been reverted,
196
195 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT, 197 BAD_DEVICES_JSON = os.path.join(DIR_SOURCE_ROOT,
196 os.environ.get('CHROMIUM_OUT_DIR', 'out'), 198 os.environ.get('CHROMIUM_OUT_DIR', 'out'),
197 'bad_devices.json') 199 'bad_devices.json')
198 200
199 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com' 201 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
200 202
201 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop' 203 DEVICE_LOCAL_PROPERTIES_PATH = '/data/local.prop'
202 204
203 PYTHON_UNIT_TEST_SUITES = { 205 PYTHON_UNIT_TEST_SUITES = {
204 'pylib_py_unittests': { 206 'pylib_py_unittests': {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 297 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
296 return 'adb' 298 return 'adb'
297 except OSError: 299 except OSError:
298 logging.debug('No adb found in $PATH, fallback to checked in binary.') 300 logging.debug('No adb found in $PATH, fallback to checked in binary.')
299 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 301 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
300 302
301 # Exit codes 303 # Exit codes
302 ERROR_EXIT_CODE = 1 304 ERROR_EXIT_CODE = 1
303 INFRA_EXIT_CODE = 87 305 INFRA_EXIT_CODE = 87
304 WARNING_EXIT_CODE = 88 306 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/instrumentation/test_jar.py » ('j') | chrome/android/java/proguard.flags » ('J')

Powered by Google App Engine
This is Rietveld 408576698