From ebfe33ad806a58410ed624e5db4b0a36883042a0 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 1 May 2018 10:07:50 -0700 Subject: [PATCH] Remove more problematic env vars I got a report of a user exporting CDPATH in their shell and causing strange issues in the build. We should never need this value (and it probably shouldn't be exported from the shell either -- that was their workaround). NDK_ROOT causes issues with Android.mk files thinking that they're building with the ndk (like external/googletest/googletest/Android.mk). Bug: 78933670 Test: CDPATH=. NDK_ROOT=test m; check out/soong.log Change-Id: Icce43d7e31ed5e5e1fb7a4e37fd4dfbf421af4b1 --- ui/build/config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/build/config.go b/ui/build/config.go index aa60b3fd3..530c3a892 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -102,8 +102,10 @@ func NewConfig(ctx Context, args ...string) Config { "OUT_DIR_COMMON_BASE", // Variables that have caused problems in the past + "CDPATH", "DISPLAY", "GREP_OPTIONS", + "NDK_ROOT", // Drop make flags "MAKEFLAGS",