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

Unified Diff: build/android/adb_install_apk.py

Issue 292313015: [Android] Switch to DeviceUtils versions of Reboot and Install. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 6 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 | build/android/enable_asserts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/adb_install_apk.py
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index 7a781eee62a0c0027a73a12f1a10be15c4fbf937..ea39aeaa6fe1e33941ea75048eeccab73eae0846 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -13,7 +13,6 @@ import sys
from pylib import android_commands
from pylib import constants
from pylib.device import device_utils
-from pylib.utils import apk_helper
def AddInstallAPKOption(option_parser):
@@ -22,8 +21,8 @@ def AddInstallAPKOption(option_parser):
help=('DEPRECATED The name of the apk containing the'
' application (with the .apk extension).'))
option_parser.add_option('--apk_package',
- help=('The package name used by the apk containing '
- 'the application.'))
+ help=('DEPRECATED The package name used by the apk '
+ 'containing the application.'))
option_parser.add_option('--keep_data',
action='store_true',
default=False,
@@ -74,11 +73,8 @@ def main(argv):
if not devices:
raise Exception('Error: no connected devices')
- if not options.apk_package:
- options.apk_package = apk_helper.GetPackageName(options.apk)
-
- device_utils.DeviceUtils.parallel(devices).old_interface.ManagedInstall(
- options.apk, options.keep_data, options.apk_package).pFinish(None)
+ device_utils.DeviceUtils.parallel(devices).Install(
+ options.apk, reinstall=options.keep_data)
if __name__ == '__main__':
« no previous file with comments | « no previous file | build/android/enable_asserts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698