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

Side by Side Diff: build/android/adb_install_apk.py

Issue 22903016: [android] Adds constants.GetOutDirectory() and converts test scripts to use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix provision_devices.py which never set the build type Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/adb_reverse_forwarder.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 multiprocessing 9 import multiprocessing
10 import optparse 10 import optparse
(...skipping 20 matching lines...) Expand all
31 default=False, 31 default=False,
32 help=('Keep the package data when installing ' 32 help=('Keep the package data when installing '
33 'the application.')) 33 'the application.'))
34 34
35 35
36 def ValidateInstallAPKOption(option_parser, options): 36 def ValidateInstallAPKOption(option_parser, options):
37 """Validates the apk option and potentially qualifies the path.""" 37 """Validates the apk option and potentially qualifies the path."""
38 if not options.apk: 38 if not options.apk:
39 option_parser.error('--apk is mandatory.') 39 option_parser.error('--apk is mandatory.')
40 if not os.path.exists(options.apk): 40 if not os.path.exists(options.apk):
41 options.apk = os.path.join(constants.DIR_SOURCE_ROOT, 41 options.apk = os.path.join(constants.GetOutDirectory(), 'apks',
42 'out', options.build_type, 42 options.apk)
43 'apks', options.apk)
44 43
45 44
46 def _InstallApk(args): 45 def _InstallApk(args):
47 apk_path, apk_package, keep_data, device = args 46 apk_path, apk_package, keep_data, device = args
48 android_commands.AndroidCommands(device=device).ManagedInstall( 47 android_commands.AndroidCommands(device=device).ManagedInstall(
49 apk_path, keep_data, apk_package) 48 apk_path, keep_data, apk_package)
50 print '----- Installed on %s -----' % device 49 print '----- Installed on %s -----' % device
51 50
52 51
53 def main(argv): 52 def main(argv):
54 parser = optparse.OptionParser() 53 parser = optparse.OptionParser()
55 AddInstallAPKOption(parser) 54 AddInstallAPKOption(parser)
56 options, args = parser.parse_args(argv) 55 options, args = parser.parse_args(argv)
56 constants.SetBuildType(options.build_type)
57 ValidateInstallAPKOption(parser, options) 57 ValidateInstallAPKOption(parser, options)
58 if len(args) > 1: 58 if len(args) > 1:
59 raise Exception('Error: Unknown argument:', args[1:]) 59 raise Exception('Error: Unknown argument:', args[1:])
60 60
61 devices = android_commands.GetAttachedDevices() 61 devices = android_commands.GetAttachedDevices()
62 if not devices: 62 if not devices:
63 raise Exception('Error: no connected devices') 63 raise Exception('Error: no connected devices')
64 64
65 if not options.apk_package: 65 if not options.apk_package:
66 options.apk_package = apk_helper.GetPackageName(options.apk) 66 options.apk_package = apk_helper.GetPackageName(options.apk)
67 67
68 pool = multiprocessing.Pool(len(devices)) 68 pool = multiprocessing.Pool(len(devices))
69 # Send a tuple (apk_path, apk_package, device) per device. 69 # Send a tuple (apk_path, apk_package, device) per device.
70 pool.map(_InstallApk, zip([options.apk] * len(devices), 70 pool.map(_InstallApk, zip([options.apk] * len(devices),
71 [options.apk_package] * len(devices), 71 [options.apk_package] * len(devices),
72 [options.keep_data] * len(devices), 72 [options.keep_data] * len(devices),
73 devices)) 73 devices))
74 74
75 75
76 if __name__ == '__main__': 76 if __name__ == '__main__':
77 sys.exit(main(sys.argv)) 77 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | build/android/adb_reverse_forwarder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698