Fix cr_cronet.py APK install when custom build directory is used

components/cronet/tools/cr_cronet.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 cr_cronet.py - cr - like helper tool for cronet developers
 """
 
 import argparse
 import os
 import sys
 
 def run(command, extra_options=''):
   command = command + ' ' + extra_options
   print command
   return os.system(command)
 
 
 def build(out_dir, test_target, extra_options=''):
   return run('ninja -C ' + out_dir + ' ' + test_target,
              extra_options)
 
 
-def install(release_arg):
-  return run('build/android/adb_install_apk.py ' + release_arg + \
-             ' --apk=CronetTest.apk') or \
-             run('build/android/adb_install_apk.py ' + release_arg + \
-             ' --apk=ChromiumNetTestSupport.apk')
+def install(out_dir, release_arg):
+  cmd = 'BUILDTYPE={0} build/android/adb_install_apk.py {1} --apk={2}'
+  build_dir = out_dir.split('/', 1)[1] # the 'Foo' part of 'out/Foo'
+  return run(cmd.format(build_dir, release_arg, 'CronetTest.apk')) or \
+    run(cmd.format(build_dir, release_arg, 'ChromiumNetTestSupport.apk'))

[mef, 2016/06/09 21:16:46]

is this properly aligned?

[mgersh, 2016/06/10 15:45:20]

The style guide just says to add a level of indentation for a hanging indent, or
optionally more.

 
 
 def test(out_dir, extra_options):
   return run(out_dir + '/bin/run_cronet_test_instrumentation_apk ' + \
              extra_options)
 
 def test_ios(out_dir, extra_options):
   return run(out_dir + '/iossim ' + out_dir + '/cronet_test.app', extra_options)
 
 def debug(extra_options):
@@ skipping 69 matching lines @@
   if (options.command=='gyp'):
     return run (gyp_defines + ' gclient runhooks')
   if (options.command=='gn'):
     return run ('gn gen ' + out_dir + ' --args=\'' + gn_args + '\'')
   if (options.command=='sync'):
     return run ('git pull --rebase && ' + gyp_defines + ' gclient sync')
   if (options.command=='build'):
     return build(out_dir, test_target, extra_options)
   if (not is_os):
     if (options.command=='install'):
-      return install(release_arg)
+      return install(out_dir, release_arg)
     if (options.command=='proguard'):
       return run ('ninja -C ' + out_dir + ' cronet_sample_proguard_apk')
     if (options.command=='test'):
-      return install(release_arg) or test(out_dir, extra_options)
+      return install(out_dir, release_arg) or test(out_dir, extra_options)
     if (options.command=='build-test'):
-      return build(out_dir, test_target) or install(release_arg) or \
+      return build(out_dir, test_target) or install(out_dir, release_arg) or \
           test(out_dir, extra_options)
     if (options.command=='stack'):
       return stack(out_dir)
     if (options.command=='debug'):
-      return install(release_arg) or debug(extra_options)
+      return install(out_dir, release_arg) or debug(extra_options)
     if (options.command=='build-debug'):
-      return build(out_dir, test_target) or install(release_arg) or \
+      return build(out_dir, test_target) or install(out_dir, release_arg) or \
           debug(extra_options)
   else:
     if (options.command=='test'):
       return test_ios(out_dir, extra_options)
     if (options.command=='build-test'):
       return build(out_dir, test_target) or test_ios(out_dir, extra_options)
 
   parser.print_help()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())