diff options
| author | 2015-07-14 00:39:06 -0700 | |
|---|---|---|
| committer | 2015-09-17 23:42:25 -0700 | |
| commit | 87b17d1ff46ab86ab897c50435c423f28be4895f (patch) | |
| tree | 69d5b2ed53c5b99aacef6b3d692256ec0b671d21 /common/env.go | |
| parent | c3ba6cb9707730e0fc553fa86b9fe6b6c9bbb4b9 (diff) | |
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 'common/env.go')
| -rw-r--r-- | common/env.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/env.go b/common/env.go index 3214baa8f..8694c28aa 100644 --- a/common/env.go +++ b/common/env.go @@ -15,6 +15,8 @@ package common import ( + "path/filepath" + "android/soong" "android/soong/env" @@ -41,7 +43,7 @@ type envSingleton struct{} func (c *envSingleton) GenerateBuildActions(ctx blueprint.SingletonContext) { envDeps := ctx.Config().(Config).EnvDeps() - envFile := ".soong.environment" + envFile := filepath.Join(ctx.Config().(Config).BuildDir(), ".soong.environment") err := env.WriteEnvFile(envFile, envDeps) if err != nil { |