[Android] Don't use a device blacklist if one isn't provided. (RELAND 2)

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import argparse
 import glob
@@ skipping 65 matching lines @@
     for split_glob in args.splits:
       apks = [f for f in glob.glob(split_glob) if f.endswith('.apk')]
       if not apks:
         logging.warning('No apks matched for %s.', split_glob)
       for f in apks:
         helper = apk_helper.ApkHelper(f)
         if (helper.GetPackageName() == base_apk_package
             and helper.GetSplitName()):
           splits.append(f)
 
-  if args.blacklist_file:
-    blacklist = device_blacklist.Blacklist(args.blacklist_file)
-  else:
-    # TODO(jbudorick): Remove this once the bots are converted.
-    blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
-
+  blacklist = (device_blacklist.Blacklist(args.blacklist_file)
+               if args.blacklist_file
+               else None)
   devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
 
   if args.device:
     devices = [d for d in devices if d == args.device]
     if not devices:
       raise device_errors.DeviceUnreachableError(args.device)
   elif not devices:
     raise device_errors.NoDevicesError()
 
   def blacklisting_install(device):
@@ skipping 12 matching lines @@
       if blacklist:
         blacklist.Extend([str(device)])
         logging.warning('Blacklisting %s', str(device))
 
   device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install)
 
 
 if __name__ == '__main__':
   sys.exit(main())