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

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

Issue 671633003: Roll android_tools and breakpad to the latest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 6 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 | « base/sys_info_android.cc ('k') | build/common.gypi » ('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 # pylint: disable=W0212 6 # pylint: disable=W0212
7 7
8 import collections 8 import collections
9 import logging 9 import logging
10 import os 10 import os
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 ADB_KEYS_FILE = '/data/misc/adb/adb_keys' 140 ADB_KEYS_FILE = '/data/misc/adb/adb_keys'
141 141
142 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results') 142 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results')
143 # The directory on the device where perf test output gets saved to. 143 # The directory on the device where perf test output gets saved to.
144 DEVICE_PERF_OUTPUT_DIR = ( 144 DEVICE_PERF_OUTPUT_DIR = (
145 '/data/data/' + PACKAGE_INFO['chrome'].package + '/files') 145 '/data/data/' + PACKAGE_INFO['chrome'].package + '/files')
146 146
147 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots') 147 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
148 148
149 ANDROID_SDK_VERSION = 21 149 ANDROID_SDK_VERSION = 21
150 ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0' 150 ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
151 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 151 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
152 'third_party/android_tools/sdk') 152 'third_party/android_tools/sdk')
153 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, 153 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
154 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION) 154 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
155 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 155 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
156 'third_party/android_tools/ndk') 156 'third_party/android_tools/ndk')
157 157
158 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT', 158 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
159 os.path.join(DIR_SOURCE_ROOT, 159 os.path.join(DIR_SOURCE_ROOT,
160 'android_emulator_sdk')) 160 'android_emulator_sdk'))
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 215 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
216 return 'adb' 216 return 'adb'
217 except OSError: 217 except OSError:
218 logging.debug('No adb found in $PATH, fallback to checked in binary.') 218 logging.debug('No adb found in $PATH, fallback to checked in binary.')
219 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 219 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
220 220
221 221
222 # Exit codes 222 # Exit codes
223 ERROR_EXIT_CODE = 1 223 ERROR_EXIT_CODE = 1
224 WARNING_EXIT_CODE = 88 224 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « base/sys_info_android.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698