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

Unified Diff: build/android/devil_chromium.py

Issue 2022533002: [Android] Add --adb-path option for tombstones.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: argparse for tombstones.py and type=os.path.abspath Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil_chromium.py
diff --git a/build/android/devil_chromium.py b/build/android/devil_chromium.py
index 8472f659bdcfd1881f9bbff155f524236cbeec8d..0e085d8abdbe0c0ca7ffd3ac9cca71b8cede62af 100644
--- a/build/android/devil_chromium.py
+++ b/build/android/devil_chromium.py
@@ -99,7 +99,7 @@ _DEVIL_BUILD_PRODUCT_DEPS = {
}
-def Initialize(output_directory=None, custom_deps=None):
+def Initialize(output_directory=None, custom_deps=None, adb_path=None):
"""Initializes devil with chromium's binaries and third-party libraries.
This includes:
@@ -147,6 +147,16 @@ def Initialize(output_directory=None, custom_deps=None):
}
if custom_deps:
devil_dynamic_config['dependencies'].update(custom_deps)
+ if adb_path:
+ devil_dynamic_config['dependencies'].update({
+ 'adb': {
+ 'file_info': {
+ devil_env.GetPlatform(): {
+ 'local_paths': [adb_path]
+ }
+ }
+ }
+ })
devil_env.config.Initialize(
configs=[devil_dynamic_config], config_files=[_DEVIL_CONFIG])
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698