diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-07-14 00:39:06 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-17 23:42:25 -0700 |
| commit | 87b17d1ff46ab86ab897c50435c423f28be4895f (patch) | |
| tree | 69d5b2ed53c5b99aacef6b3d692256ec0b671d21 /cmd | |
| parent | c3ba6cb9707730e0fc553fa86b9fe6b6c9bbb4b9 (diff) | |
| download | build_soong-87b17d1ff46ab86ab897c50435c423f28be4895f.tar.gz build_soong-87b17d1ff46ab86ab897c50435c423f28be4895f.tar.bz2 build_soong-87b17d1ff46ab86ab897c50435c423f28be4895f.zip | |
Use SRCDIR as a working directory
The existing behavior of using the build directory as the working
directory is useful if you want to move/copy the output directory around
and SRCDIR still refers the the source. But, it's more useful to have
the source directory be the working directory. Tools like cpp(__FILE__)
and other debug prints embed relative paths from the working directory.
We also have tools that expect the working directory to be $TOP.
Change-Id: Ia0f1d3c6b7df72d61cf5628efa2baa98bd19775b
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/soong_build/main.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go index 65194020..254f9225 100644 --- a/cmd/soong_build/main.go +++ b/cmd/soong_build/main.go @@ -35,7 +35,7 @@ func main() { ctx := soong.NewContext() - configuration, err := common.NewConfig(srcDir) + configuration, err := common.NewConfig(srcDir, bootstrap.BuildDir) if err != nil { fmt.Fprintf(os.Stderr, "%s", err) os.Exit(1) @@ -44,5 +44,5 @@ func main() { // Temporary hack //ctx.SetIgnoreUnknownModuleTypes(true) - bootstrap.Main(ctx, configuration, common.ConfigFileName, common.ProductVariablesFileName) + bootstrap.Main(ctx, configuration, configuration.ConfigFileName, configuration.ProductVariablesFileName) } |