aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-04-18 13:56:57 -0700
committerDan Willemsen <dwillemsen@google.com>2017-04-18 14:02:38 -0700
commit68a09854a449cf17724f1f5922de7765d289a4f5 (patch)
tree915b5466340659dda6440ffcfafb116dbc76c6b2 /ui
parente87b768200fb1ea3a9a47645b3e4159d549c0b70 (diff)
downloadbuild_soong-68a09854a449cf17724f1f5922de7765d289a4f5.tar.gz
build_soong-68a09854a449cf17724f1f5922de7765d289a4f5.tar.bz2
build_soong-68a09854a449cf17724f1f5922de7765d289a4f5.zip
Blacklist DISPLAY / GREP_OPTIONS
We keep having makefiles reading $DISPLAY, and GREP_OPTIONS with --color=always has caused problems with shell commands in the past. Bug: 37333696 Test: GREP_OPTIONS="--color=always" m -j Test: DISPLAY=test m -j (modify an Android.mk to check DISPLAY) Change-Id: Iafab37d61ecde5c6fdb35a05f18709abc17e8554
Diffstat (limited to 'ui')
-rw-r--r--ui/build/config.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/build/config.go b/ui/build/config.go
index 9a8a3fb3..c01bf4c9 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -83,6 +83,10 @@ func NewConfig(ctx Context, args ...string) Config {
// We handle this above
"OUT_DIR_COMMON_BASE",
+
+ // Variables that have caused problems in the past
+ "DISPLAY",
+ "GREP_OPTIONS",
)
// Tell python not to spam the source tree with .pyc files.