tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unset envsetup.sh variables inside build

Browse source 
Using ANDROID_BUILD_TOP and other envsetup.sh varialbes is already
forbidden in makefiles, but some tools run by the build (like
hidl-gen) will use it if it is set.  Since they are set by envsetup.sh,
and sourcing envsetup.sh before building is optional, unset them inside
the build to get consistent behavior.

Bug: 79250545
Test: m checkbuild
Change-Id: I3e7d9f01390ccdc34c49115f2f15cd7542d9974b
This commit is contained in:
Colin Cross 2018-07-11 14:49:31 -07:00
parent 7f1c57ee33
commit 7f09c40c49
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ui/build/config.go
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.