Add --adb-options to tools/apk-masseur.py
R=herhut
Change-Id: Ia297e63c4329c33252b6ae0c7635d12d21dad043
diff --git a/tools/apk-masseur.py b/tools/apk-masseur.py
index 6e3528a..8e98e47 100755
--- a/tools/apk-masseur.py
+++ b/tools/apk-masseur.py
@@ -28,6 +28,9 @@
help='install the generated apk with adb options -t -r -d',
default=False,
action='store_true')
+ parser.add_option('--adb-options',
+ help='additional adb options when running adb',
+ default=None)
(options, args) = parser.parse_args()
if len(args) != 1:
parser.error('Expected <apk> argument, got: ' + ' '.join(args))
@@ -106,10 +109,14 @@
aligned_apk = align(signed_apk, temp)
print 'Writing result to', options.out
shutil.copyfile(aligned_apk, options.out)
+ adb_cmd = ['adb']
+ if options.adb_options:
+ adb_cmd.extend(
+ [option for option in options.adb_options.split(' ') if option])
if options.install:
- cmd = ['adb', 'install', '-t', '-r', '-d', options.out]
- utils.PrintCmd(cmd)
- subprocess.check_call(cmd)
+ adb_cmd.extend(['install', '-t', '-r', '-d', options.out]);
+ utils.PrintCmd(adb_cmd)
+ subprocess.check_call(adb_cmd)
return 0
if __name__ == '__main__':
