Added --env flag to build_chromeos.py to pass in custom env.
Tested: python build_chromeos.py --env=USE=-chrome_internal builds the
external version of Chrome.
PRESUBMIT=passed
R=shenhan,bjanakiraman,yunlian
DELTA=7 (5 added, 0 deleted, 2 changed)
OCL=62883-p2
RCL=62886-p2
RDATE=2012/09/19 14:09:35
P4 change: 42793366
diff --git a/v14/build_chromeos.py b/v14/build_chromeos.py
index dceec7b..c2285ad 100755
--- a/v14/build_chromeos.py
+++ b/v14/build_chromeos.py
@@ -54,6 +54,10 @@
help="ChromeOS target board, e.g. x86-generic")
parser.add_option("--label", dest="label",
help="Optional label symlink to point to build dir.")
+ parser.add_option("--env",
+ dest="env",
+ default="",
+ help="Env to pass to build_packages.")
parser.add_option("--vanilla", dest="vanilla",
default=False,
action="store_true",
@@ -67,7 +71,7 @@
if options.board is None:
Usage(parser, "--board must be set")
- build_packages_env = ""
+ build_packages_env = options.env
if options.rebuild == True:
build_packages_env = "EXTRA_BOARD_FLAGS=-e"
@@ -84,7 +88,7 @@
usepkg=False,
force=options.clobber_board)
command += "; " + build_packages_env + " " + build_packages_command
- command += "&& " + build_image_command
+ command += "&& " + build_packages_env + " " + build_image_command
ret = cmd_executer.ChrootRunCommand(options.chromeos_root, command)
return ret
@@ -122,6 +126,7 @@
# Build image
ret = cmd_executer.ChrootRunCommand(options.chromeos_root,
+ build_packages_env + " " +
build_image_command)
logger.GetLogger().LogFatalIf(ret, "build_image failed")