Add additional directories from which env config can be loaded am: ef073be177
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18881793
Change-Id: If9f884d90e83ed958a929e0e2bb387b01d0a21c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index d416d54..a7f9260 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -53,12 +53,23 @@
return indexList(s, list) != -1
}
-func loadEnvConfig() error {
+func loadEnvConfig(config build.Config) error {
bc := os.Getenv("ANDROID_BUILD_ENVIRONMENT_CONFIG")
if bc == "" {
return nil
}
- cfgFile := filepath.Join(os.Getenv("TOP"), configDir, fmt.Sprintf("%s.%s", bc, jsonSuffix))
+ configDirs := []string{
+ os.Getenv("ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR"),
+ config.OutDir(),
+ configDir,
+ }
+ var cfgFile string
+ for _, dir := range configDirs {
+ cfgFile = filepath.Join(os.Getenv("TOP"), dir, fmt.Sprintf("%s.%s", bc, jsonSuffix))
+ if _, err := os.Stat(cfgFile); err == nil {
+ break
+ }
+ }
envVarsJSON, err := ioutil.ReadFile(cfgFile)
if err != nil {
@@ -74,9 +85,7 @@
if os.Getenv(k) != "" {
continue
}
- if err := os.Setenv(k, v); err != nil {
- return err
- }
+ config.Environment().Set(k, v)
}
return nil
}
@@ -148,12 +157,11 @@
config = build.NewConfig(buildCtx, os.Args[1:]...)
}
- if err := loadEnvConfig(); err != nil {
+ if err := loadEnvConfig(config); err != nil {
fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
os.Exit(1)
}
-
build.SetupOutDir(buildCtx, config)
logsDir := config.OutDir()