[Android] Only pass --adb-path to adb_install_apk for M51 and above.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import urllib
@@ skipping 484 matching lines @@
 
   def apk_path(self, apk):
     return self.m.chromium.output_dir.join('apks', apk) if apk else None
 
   def adb_install_apk(self, apk, allow_downgrade=False, devices=None):
     install_cmd = [
         self.m.path['checkout'].join('build',
                                      'android',
                                      'adb_install_apk.py'),
         apk, '-v', '--blacklist-file', self.blacklist_file,
-        '--adb-path', self.m.adb.adb_path(),
     ]
+    if int(self.m.chromium.get_version().get('MAJOR', 0)) > 50:

[martiniss, 2016/06/13 23:17:30]

this should be get('MAJOR', '0'), right? 

[jbudorick, 2016/06/14 19:03:04]

It doesn't matter -- int(0) and int('0') will both yield 0

+      install_cmd += ['--adb-path', self.m.adb.adb_path()]
     if devices and isinstance(devices, list):
       for d in devices:
         install_cmd += ['-d', d]
     if allow_downgrade:
       install_cmd.append('--downgrade')
     if self.m.chromium.c.BUILD_CONFIG == 'Release':
       install_cmd.append('--release')
     return self.m.step('install ' + self.m.path.basename(apk), install_cmd,
                        infra_step=True,
                        env=self.m.chromium.get_env())
@@ skipping 784 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)