Update prebuilt to use cros_overlay_list as the definitive answer for which overlay to modify.

prebuilt.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS 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 datetime
 import multiprocessing
 import optparse
 import os
 import re
@@ skipping 36 matching lines @@
 _HOST_TARGET = 'amd64'
 _BOARD_PATH = 'chroot/build/%(board)s'
 _BOTO_CONFIG = '/home/chrome-bot/external-boto'
 # board/board-target/version/packages/'
 _REL_BOARD_PATH = 'board/%(board)s/%(version)s/packages'
 # host/host-target/version/packages/'
 _REL_HOST_PATH = 'host/%(target)s/%(version)s/packages'
 # Private overlays to look at for builds to filter
 # relative to build path
 _PRIVATE_OVERLAY_DIR = 'src/private-overlays'
-_BINHOST_BASE_DIR = 'src/overlays'
 _BINHOST_BASE_URL = 'http://commondatastorage.googleapis.com/chromeos-prebuilt'
 _PREBUILT_BASE_DIR = 'src/third_party/chromiumos-overlay/chromeos/config/'
 # Created in the event of new host targets becoming available
 _PREBUILT_MAKE_CONF = {'amd64': os.path.join(_PREBUILT_BASE_DIR,
                                              'make.conf.amd64-host')}
 _BINHOST_CONF_DIR = 'src/third_party/chromiumos-overlay/chromeos/binhost'
 
 
 class FiltersEmpty(Exception):
   """Raised when filters are used but none are found."""
@@ skipping 249 matching lines @@
   upload_files = {}
   for pkg in pkgs:
     suffix = pkg['CPV'] + '.tbz2'
     local_path = os.path.join(base_local_path, suffix)
     assert os.path.exists(local_path)
     remote_path = '%s/%s' % (base_remote_path.rstrip('/'), suffix)
     upload_files[local_path] = remote_path
 
   return upload_files
 
+def GetBoardPathFromCrosOverlayList(build_path, target):
+  """Use the cros_overlay_list to determine the path to the board overlay
+   Args:
+     build_path: The path to the root of the build directory
+     target: The target that we are looking for, could consist of board and
+       board_variant, we handle that properly
+   Returns:
+     The last line from cros_overlay_list as a string
+  """
+  script_dir = os.path.join(build_path, 'src/scripts/bin')
+  cmd = ['./cros_overlay_list']
+  if re.match('.*?_.*', target):
+    (board, variant) = target.split('_')
+    cmd += ['--board', board, '--variant', variant]
+  elif re.match('.*?-\w+', target):
+    cmd += ['--board', target]
+  else:
+    raise UnknownBoardFormat('Unknown format: %s' % target)
 
-def DeterminePrebuiltConfFile(target):
+  cmd_output = cros_build_lib.RunCommand(cmd, redirect_stdout=True,
+                                         cwd=script_dir)
+  # We only care about the last entry
+  return cmd_output.output.splitlines().pop()
+
+
+def DeterminePrebuiltConfFile(build_path, target):
   """Determine the prebuilt.conf file that needs to be updated for prebuilts.
 
     Args:
+      build_path: The path to the root of the build directory
       target: String representation of the board. This includes host and board
         targets
 
     Returns
       A string path to a prebuilt.conf file to be updated.
   """
-  overlay_base_dir = _BINHOST_BASE_DIR
-  # If this is a private checkout default to updating
-  # private overlays over public.
-  if os.path.exists(_PRIVATE_OVERLAY_DIR):
-    overlay_base_dir = _PRIVATE_OVERLAY_DIR
-
   if _HOST_TARGET == target:
     # We are host.
     # Without more examples of hosts this is a kludge for now.
     # TODO(Scottz): as new host targets come online expand this to
     # work more like boards.
     make_path =  _PREBUILT_MAKE_CONF[target]
-  elif re.match('.*?_.*', target):
-    # We are a board variant
-    overlay_str = 'overlay-variant-%s' % target.replace('_', '-')
-    make_path = os.path.join(overlay_base_dir, overlay_str, 'prebuilt.conf')
-  elif re.match('.*?-\w+', target):
-    overlay_str = 'overlay-%s' % target
-    make_path = os.path.join(overlay_base_dir, overlay_str, 'prebuilt.conf')
   else:
-    raise UnknownBoardFormat('Unknown format: %s' % target)
+    # We are a board
+    board = GetBoardPathFromCrosOverlayList(build_path, target)
+    make_path = os.path.join(board, 'prebuilt.conf')
 
-  return os.path.join(make_path)
+  return make_path
 
 
 def UpdateBinhostConfFile(path, key, value):
   """Update binhost config file file with key=value.
 
   Args:
     path: Filename to update.
     key: Key to update.
     value: New value for key.
   """
@@ skipping 42 matching lines @@
     url_suffix = _REL_HOST_PATH % {'version': version, 'target': _HOST_TARGET}
     package_string = _HOST_TARGET
     git_file = os.path.join(build_path, _PREBUILT_MAKE_CONF[_HOST_TARGET])
     binhost_conf = os.path.join(build_path, _BINHOST_CONF_DIR, 'host',
         '%s.conf' % _HOST_TARGET)
   else:
     board_path = os.path.join(build_path, _BOARD_PATH % {'board': board})
     package_path = os.path.join(board_path, 'packages')
     package_string = board
     url_suffix = _REL_BOARD_PATH % {'board': board, 'version': version}
-    git_file = os.path.join(build_path, DeterminePrebuiltConfFile(board))
+    git_file = DeterminePrebuiltConfFile(build_path, board)
     binhost_conf = os.path.join(build_path, _BINHOST_CONF_DIR, 'target',
         '%s.conf' % board)
   remote_location = '%s/%s' % (upload_location.rstrip('/'), url_suffix)
 
   # Process Packages file, removing duplicates and filtered packages.
   pkg_index = GrabLocalPackageIndex(package_path)
   pkg_index.SetUploadLocation(binhost_base_url, url_suffix)
   pkg_index.RemoveFilteredPackages(lambda pkg: ShouldFilterPackage(pkg))
   uploads = pkg_index.ResolveDuplicateUploads(pkg_indexes)
 
@@ skipping 108 matching lines @@
   if options.board:
     UploadPrebuilt(options.build_path, options.upload, version,
                    options.binhost_base_url, board=options.board,
                    git_sync=options.git_sync, key=options.key,
                    pkg_indexes=pkg_indexes,
                    sync_binhost_conf=options.sync_binhost_conf)
 
 
 if __name__ == '__main__':
   main()