diff options
Diffstat (limited to 'android/config.go')
| -rw-r--r-- | android/config.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android/config.go b/android/config.go index d148012f4..bed57e3b5 100644 --- a/android/config.go +++ b/android/config.go @@ -80,9 +80,10 @@ type SoongBuildMode int type CmdArgs struct { bootstrap.Args - RunGoTests bool - OutDir string - SoongOutDir string + RunGoTests bool + OutDir string + SoongOutDir string + SoongVariables string SymlinkForestMarker string Bp2buildMarker string @@ -491,7 +492,7 @@ func NullConfig(outDir, soongOutDir string) Config { func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error) { // Make a config with default options. config := &config{ - ProductVariablesFileName: filepath.Join(cmdArgs.SoongOutDir, productVariablesFileName), + ProductVariablesFileName: cmdArgs.SoongVariables, env: availableEnv, |