Revert "Add the ability to pass use flags through cbuildbot to build_packages."

buildbot/cbuildbot_commands.py

 # Copyright (c) 2011 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.
 
 """Module containing the various individual commands a builder can run."""
 
 import os
 import re
 import shutil
 import sys
@@ skipping 135 matching lines @@
   cros_lib.OldRunCommand(cmd, cwd=cwd)
 
 
 def SetupBoard(buildroot, board='x86-generic'):
   """Wrapper around setup_board."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   cros_lib.OldRunCommand(
       ['./setup_board', '--fast', '--default', '--board=%s' % board], cwd=cwd,
       enter_chroot=True)
 
-def Build(buildroot, emptytree, build_autotest=True, usepkg=True,
-          extra_env=None):
+
+def Build(buildroot, emptytree, build_autotest=True, usepkg=True):
   """Wrapper around build_packages."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   cmd = ['./build_packages']
-  env = []
   if not build_autotest: cmd.append('--nowithautotest')
   if not usepkg: cmd.append('--nousepkg')
   if emptytree:
-    env.append('EXTRA_BOARD_FLAGS=--emptytree')
-  if extra_env:
-    env.extend(extra_env)
-  if env:
-    cmd = ['sh', '-c', '%s %s' % (' '.join(env), ' '.join(cmd))]
+    cmd = ['sh', '-c', 'EXTRA_BOARD_FLAGS=--emptytree %s' % ' '.join(cmd)]
 
   cros_lib.OldRunCommand(cmd, cwd=cwd, enter_chroot=True)
 
 
 def BuildImage(buildroot):
   _WipeOldOutput(buildroot)
 
   cwd = os.path.join(buildroot, 'src', 'scripts')
   cros_lib.OldRunCommand(['./build_image', '--replace'], cwd=cwd,
                          enter_chroot=True)
@@ skipping 269 matching lines @@
 
   archive_url = None
   key_re = re.compile('^%s=(.*)$' % _CROS_ARCHIVE_URL)
   for line in result.output.splitlines():
     line_match = key_re.match(line)
     if line_match:
       archive_url = line_match.group(1)
 
   assert archive_url, 'Archive Build Failed to Provide Archive URL'
   return archive_url