1 files changed, 10 insertions, 23 deletions
diff --git a/scripts/cros_list_overlays.py b/scripts/cros_list_overlays.py
index 2cead1b9b..754a041d8 100644
--- a/scripts/cros_list_overlays.py
+++ b/scripts/cros_list_overlays.py
@@ -9,7 +9,6 @@ from __future__ import print_function
 import os
 
 from chromite.cbuildbot import constants
-from chromite.lib import brick_lib
 from chromite.lib import commandline
 from chromite.lib import cros_build_lib
 from chromite.lib import portage_util
@@ -28,7 +27,6 @@ def _ParseArguments(argv):
                            'only makes sense when --board is specified.')
   parser.add_argument('-a', '--all', default=False, action='store_true',
                       help='Show all overlays (even common ones).')
-  parser.add_argument('--brick', help='Main brick to use')
 
   opts = parser.parse_args(argv)
   opts.Freeze()
@@ -36,13 +34,6 @@ def _ParseArguments(argv):
   if opts.primary_only and opts.board is None:
     parser.error('--board is required when --primary_only is supplied.')
 
-  if opts.brick:
-    if opts.board:
-      parser.error('--board and --brick are incompatible.')
-
-    if opts.all:
-      parser.error('Cannot list all overlays with --brick')
-
   return opts
 
 
@@ -50,21 +41,17 @@ def main(argv):
   opts = _ParseArguments(argv)
   args = (constants.BOTH_OVERLAYS, opts.board)
 
-  if opts.brick:
-    main_brick = brick_lib.Brick(opts.brick)
-    overlays = [b.OverlayDir() for b in main_brick.BrickStack()]
+  # Verify that a primary overlay exists.
+  try:
+    primary_overlay = portage_util.FindPrimaryOverlay(*args)
+  except portage_util.MissingOverlayException as ex:
+    cros_build_lib.Die(str(ex))
+
+  # Get the overlays to print.
+  if opts.primary_only:
+    overlays = [primary_overlay]
   else:
-    # Verify that a primary overlay exists.
-    try:
-      primary_overlay = portage_util.FindPrimaryOverlay(*args)
-    except portage_util.MissingOverlayException as ex:
-      cros_build_lib.Die(str(ex))
-
-    # Get the overlays to print.
-    if opts.primary_only:
-      overlays = [primary_overlay]
-    else:
-      overlays = portage_util.FindOverlays(*args)
+    overlays = portage_util.FindOverlays(*args)
 
   # Exclude any overlays in src/third_party, for backwards compatibility with
   # scripts that expected these to not be listed.