| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 """Utility script to install APKs from the command line quickly.""" | 7 """Utility script to install APKs from the command line quickly.""" |
| 8 | 8 |
| 9 import argparse | 9 import argparse |
| 10 import glob | 10 import glob |
| 11 import logging | 11 import logging |
| 12 import os | 12 import os |
| 13 import sys | 13 import sys |
| 14 | 14 |
| 15 from devil.android import apk_helper |
| 16 from devil.android import device_blacklist |
| 17 from devil.android import device_errors |
| 18 from devil.android import device_utils |
| 19 from devil.utils import run_tests_helper |
| 15 from pylib import constants | 20 from pylib import constants |
| 16 from pylib.device import device_blacklist | |
| 17 from pylib.device import device_errors | |
| 18 from pylib.device import device_utils | |
| 19 from pylib.utils import apk_helper | |
| 20 from pylib.utils import run_tests_helper | |
| 21 | 21 |
| 22 | 22 |
| 23 def main(): | 23 def main(): |
| 24 parser = argparse.ArgumentParser() | 24 parser = argparse.ArgumentParser() |
| 25 | 25 |
| 26 apk_group = parser.add_mutually_exclusive_group(required=True) | 26 apk_group = parser.add_mutually_exclusive_group(required=True) |
| 27 apk_group.add_argument('--apk', dest='apk_name', | 27 apk_group.add_argument('--apk', dest='apk_name', |
| 28 help='DEPRECATED The name of the apk containing the' | 28 help='DEPRECATED The name of the apk containing the' |
| 29 ' application (with the .apk extension).') | 29 ' application (with the .apk extension).') |
| 30 apk_group.add_argument('apk_path', nargs='?', | 30 apk_group.add_argument('apk_path', nargs='?', |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 if blacklist: | 114 if blacklist: |
| 115 blacklist.Extend([str(device)]) | 115 blacklist.Extend([str(device)]) |
| 116 logging.warning('Blacklisting %s', str(device)) | 116 logging.warning('Blacklisting %s', str(device)) |
| 117 | 117 |
| 118 device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install) | 118 device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install) |
| 119 | 119 |
| 120 | 120 |
| 121 if __name__ == '__main__': | 121 if __name__ == '__main__': |
| 122 sys.exit(main()) | 122 sys.exit(main()) |
| 123 | 123 |
| OLD | NEW |