Commit b4ecaad6 authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

DevX: correctly initialize devil in chromium

This modifies several scripts to call devil_chromium.Initialize()
correctly, rather than to call script_common.InitializeEnvironment(), to
use the better environment defaults provided by devil_chromium.

This should reduce adb server restarts by using a consistent adb binary
across all scripts.

Bug: 978697
Test: Run each script with -vv, verify it defaults to the correct adb binary
Test: Run each script with -vv and --adb-path, verify it uses the specified adb
Change-Id: Ib792dbeacec36f5fc6cd68593d27dc947fcfc2d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1705314Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678449}
parent 09afcec7
...@@ -79,8 +79,7 @@ https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/net-d ...@@ -79,8 +79,7 @@ https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/net-d
args = parser.parse_args() args = parser.parse_args()
logging_common.InitializeLogging(args) logging_common.InitializeLogging(args)
devil_chromium.Initialize() devil_chromium.Initialize(adb_path=args.adb_path)
script_common.InitializeEnvironment(args)
# Only use a single device, for the sake of simplicity (of implementation and # Only use a single device, for the sake of simplicity (of implementation and
# user experience). # user experience).
......
...@@ -112,8 +112,7 @@ development. ...@@ -112,8 +112,7 @@ development.
args = parser.parse_args() args = parser.parse_args()
logging_common.InitializeLogging(args) logging_common.InitializeLogging(args)
devil_chromium.Initialize() devil_chromium.Initialize(adb_path=args.adb_path)
script_common.InitializeEnvironment(args)
devices = device_utils.DeviceUtils.HealthyDevices(device_arg=args.devices) devices = device_utils.DeviceUtils.HealthyDevices(device_arg=args.devices)
device_utils.DeviceUtils.parallel(devices).pMap(RemovePreinstalledWebViews) device_utils.DeviceUtils.parallel(devices).pMap(RemovePreinstalledWebViews)
......
...@@ -219,7 +219,6 @@ def RealMain(mapping, device_arg, package, status, hide_summary, workdir): ...@@ -219,7 +219,6 @@ def RealMain(mapping, device_arg, package, status, hide_summary, workdir):
def main(): def main():
devil_chromium.Initialize()
parser = argparse.ArgumentParser(description=""" parser = argparse.ArgumentParser(description="""
List Java classes in an APK which fail ART class verification. List Java classes in an APK which fail ART class verification.
""") """)
...@@ -262,7 +261,7 @@ List Java classes in an APK which fail ART class verification. ...@@ -262,7 +261,7 @@ List Java classes in an APK which fail ART class verification.
logging_common.AddLoggingArguments(parser) logging_common.AddLoggingArguments(parser)
args = parser.parse_args() args = parser.parse_args()
script_common.InitializeEnvironment(args) devil_chromium.Initialize(adb_path=args.adb_path)
logging_common.InitializeLogging(args) logging_common.InitializeLogging(args)
if args.workdir: if args.workdir:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment