android: remove deprecated device arguments from //build/android scri…

…pts.

Bug: 1097306
Change-Id: I5ddd98b323bf7bc24015c5e561a559bcab7d9aca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2439797
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812122}

build/android/adb_install_apk.py

@@ -58,11 +58,6 @@ def main():
                            ' times for multiple devices.')
   parser.add_argument('--adb-path', type=os.path.abspath,
                       help='Absolute path to the adb binary to use.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --denylist-file.
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file', help='Device denylist JSON file.')
   parser.add_argument('-v', '--verbose', action='count',
                       help='Enable verbose logging.')

build/android/adb_reverse_forwarder.py

@@ -39,11 +39,6 @@ def main(argv):
   parser.add_argument(
       '--device',
       help='Serial number of device we should use.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --denylist-file.
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file', help='Device denylist JSON file.')
   parser.add_argument(
       '--debug',

build/android/provision_devices.py

@@ -501,11 +501,6 @@ def main():
                       ' (the default is to provision all devices attached)')
   parser.add_argument('--adb-path',
                       help='Absolute path to the adb binary to use.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --denylist-file.
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file', help='Device denylist JSON file.')
   parser.add_argument('--phase', action='append', choices=_PHASES.ALL,
                       dest='phases',
@@ -544,11 +539,6 @@ def main():
                       help='Log more information.')
   parser.add_argument('--max-battery-temp', type=int, metavar='NUM',
                       help='Wait for the battery to have this temp or lower.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --output-device-denylist.
-  parser.add_argument('--output-device-blacklist',
-                      dest='output_device_denylist',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--output-device-denylist',
                       help='Json file to output the device denylist.')
   parser.add_argument('--chrome-specific-wipe', action='store_true',

build/android/test_runner.py

@@ -263,11 +263,6 @@ def AddDeviceOptions(parser):
       type=os.path.realpath,
       help='Specify the absolute path of the adb binary that '
            'should be used.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --denylist-file.
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file',
                       type=os.path.realpath,
                       help='Device denylist file.')

build/android/tombstones.py

@@ -233,11 +233,6 @@ def main():
   parser.add_argument('--device',
                       help='The serial number of the device. If not specified '
                            'will use all devices.')
-  # TODO(crbug.com/1097306): Remove this once callers have all switched to
-  # --denylist-file.
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file', help='Device denylist JSON file.')
   parser.add_argument('-a', '--all-tombstones', action='store_true',
                       help='Resolve symbols for all tombstones, rather than '

build/android/update_verification.py

@@ -63,9 +63,6 @@ def main():
       description="Script to do semi-automated upgrade testing.")
   parser.add_argument('-v', '--verbose', action='count',
                       help='Print verbose log information.')
-  parser.add_argument('--blacklist-file',
-                      dest='denylist_file',
-                      help=argparse.SUPPRESS)
   parser.add_argument('--denylist-file', help='Device denylist JSON file.')
   command_parsers = parser.add_subparsers(dest='command')