diff options
| author | Colin Cross <ccross@android.com> | 2018-07-12 19:38:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-12 19:38:20 +0000 |
| commit | 22739c36213ef61a840a434075e417b9befca615 (patch) | |
| tree | 58d7136a82650a230a19677dd85d55481630ddd5 | |
| parent | 9fab1220b9595744bb2f00e2e035116a91868ea8 (diff) | |
| parent | 7f09c40c4924ac2e8510036bfa6ce264216bc964 (diff) | |
| download | build_soong-22739c36213ef61a840a434075e417b9befca615.tar.gz build_soong-22739c36213ef61a840a434075e417b9befca615.tar.bz2 build_soong-22739c36213ef61a840a434075e417b9befca615.zip | |
Merge "Unset envsetup.sh variables inside build"
| -rw-r--r-- | ui/build/config.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index d0378ec0..1f7656ee 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -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. |