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

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

Issue 415463002: [Android] Configurable instrumentation test runner + test SDK levels. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove MaxAndroidSdkLevel. Created 6 years, 5 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 # 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 ADB_KEYS_FILE = '/data/misc/adb/adb_keys' 127 ADB_KEYS_FILE = '/data/misc/adb/adb_keys'
128 128
129 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results') 129 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results')
130 # The directory on the device where perf test output gets saved to. 130 # The directory on the device where perf test output gets saved to.
131 DEVICE_PERF_OUTPUT_DIR = ( 131 DEVICE_PERF_OUTPUT_DIR = (
132 '/data/data/' + PACKAGE_INFO['chrome'].package + '/files') 132 '/data/data/' + PACKAGE_INFO['chrome'].package + '/files')
133 133
134 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots') 134 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
135 135
136 ANDROID_SDK_VERSION = 20 136 ANDROID_SDK_VERSION = 20
137 ANDROID_L_SDK_VERSION = 20
Maria 2014/07/25 23:14:33 this is not correct, but also it doesn't seem to b
jbudorick 2014/07/25 23:25:40 This is a relic from a previous revision. Removed.
137 ANDROID_SDK_BUILD_TOOLS_VERSION = '20.0.0' 138 ANDROID_SDK_BUILD_TOOLS_VERSION = '20.0.0'
138 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 139 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
139 'third_party/android_tools/sdk') 140 'third_party/android_tools/sdk')
140 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, 141 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
141 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION) 142 'build-tools', ANDROID_SDK_BUILD_TOOLS_VERSION)
142 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 143 ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
143 'third_party/android_tools/ndk') 144 'third_party/android_tools/ndk')
144 145
145 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT', 146 EMULATOR_SDK_ROOT = os.environ.get('ANDROID_EMULATOR_SDK_ROOT',
146 os.path.join(DIR_SOURCE_ROOT, 147 os.path.join(DIR_SOURCE_ROOT,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull) 199 subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
199 return 'adb' 200 return 'adb'
200 except OSError: 201 except OSError:
201 logging.debug('No adb found in $PATH, fallback to checked in binary.') 202 logging.debug('No adb found in $PATH, fallback to checked in binary.')
202 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb') 203 return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
203 204
204 205
205 # Exit codes 206 # Exit codes
206 ERROR_EXIT_CODE = 1 207 ERROR_EXIT_CODE = 1
207 WARNING_EXIT_CODE = 88 208 WARNING_EXIT_CODE = 88
OLDNEW
« no previous file with comments | « build/android/pylib/android_commands.py ('k') | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698