diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-11 16:55:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-14 13:39:34 -0700 |
| commit | 4d6af1f89e0c434aa0cc42e0d061548d2ddf7cfa (patch) | |
| tree | eb612e90fa805dcad2657f747f1e5f7e02dbd6cb /bootstrap/cleanup.go | |
| parent | 9cdb70b93bcbb6e1e1575537546cb7f2cc6a4641 (diff) | |
| download | android_build_blueprint-4d6af1f89e0c434aa0cc42e0d061548d2ddf7cfa.tar.gz android_build_blueprint-4d6af1f89e0c434aa0cc42e0d061548d2ddf7cfa.tar.bz2 android_build_blueprint-4d6af1f89e0c434aa0cc42e0d061548d2ddf7cfa.zip | |
Fix bootstrap and separate buildDir ninja cleanup
With the introduction of $buildDir in bootstrapDir, the ninja cleanup
step hasn't been able to cleanup during the bootstrap stages. The main
stage was unaffected, as long as you were using "." as your buildDir.
Change-Id: I277dd7864989f9052d96cab9ce377548a1391a80
Diffstat (limited to 'bootstrap/cleanup.go')
| -rw-r--r-- | bootstrap/cleanup.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/cleanup.go b/bootstrap/cleanup.go index 1e1fc03..89c4b3e 100644 --- a/bootstrap/cleanup.go +++ b/bootstrap/cleanup.go @@ -32,12 +32,12 @@ const logFileName = ".ninja_log" func removeAbandonedFiles(ctx *blueprint.Context, config *Config, srcDir, manifestFile string) error { - buildDir := "." + buildDir := BuildDir switch config.stage { case StageBootstrap: - buildDir = miniBootstrapDir + buildDir = filepath.Join(buildDir, miniBootstrapSubDir) case StagePrimary: - buildDir = bootstrapDir + buildDir = filepath.Join(buildDir, bootstrapSubDir) } targetRules, err := ctx.AllTargets() |