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

Unified Diff: tools/android/loading/device_setup.py

Issue 2722113003: Android Loading Tools: use computed adb path for cert install (Closed)
Patch Set: remove stray edit Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/loading/device_setup.py
diff --git a/tools/android/loading/device_setup.py b/tools/android/loading/device_setup.py
index 954ae09342a8a16d8c9ee3269027179b3b5ac33c..e39ab86b358ef2d4d7c416e9d299c1d3cd66c3c2 100644
--- a/tools/android/loading/device_setup.py
+++ b/tools/android/loading/device_setup.py
@@ -20,6 +20,7 @@ sys.path.append(os.path.join(_CATAPULT_DIR, 'devil'))
from devil.android import device_utils
from devil.android import flag_changer
from devil.android import forwarder
+from devil.android.sdk import adb_wrapper
from devil.android.sdk import intent
sys.path.append(os.path.join(_SRC_DIR, 'build', 'android'))
@@ -318,7 +319,8 @@ def RemoteWprHost(device, wpr_archive_path, record=False,
certutils.write_dummy_ca_cert(*certutils.generate_dummy_ca_cert(),
cert_path=wpr_ca_cert_path)
device_cert_util = adb_install_cert.AndroidCertInstaller(
- device.adb.GetDeviceSerial(), None, wpr_ca_cert_path)
+ device.adb.GetDeviceSerial(), None, wpr_ca_cert_path,
+ adb_wrapper.AdbWrapper.GetAdbPath())
device_cert_util.install_cert(overwrite_cert=True)
try:
# Set up WPR server
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698