Merge "Unset envsetup.sh variables inside build"

am: 22739c3621

Change-Id: I4cebf6563f6699594e2f5afadb4b2a5a1b931731
This commit is contained in:
Colin Cross
2018-07-12 13:06:19 -07:00
committed by android-build-merger

View File

@@ -118,6 +118,18 @@ func NewConfig(ctx Context, args ...string) Config {
// Set in envsetup.sh, reset in makefiles
"ANDROID_JAVA_TOOLCHAIN",
// Set by envsetup.sh, but shouldn't be used inside the build because envsetup.sh is optional
"ANDROID_BUILD_TOP",
"ANDROID_HOST_OUT",
"ANDROID_PRODUCT_OUT",
"ANDROID_HOST_OUT_TESTCASES",
"ANDROID_TARGET_OUT_TESTCASES",
"ANDROID_TOOLCHAIN",
"ANDROID_TOOLCHAIN_2ND_ARCH",
"ANDROID_DEV_SCRIPTS",
"ANDROID_EMULATOR_PREBUILTS",
"ANDROID_PRE_BUILD_PATHS",
)
// Tell python not to spam the source tree with .pyc files.