diff options
| author | 2021-08-26 15:07:24 +0200 | |
|---|---|---|
| committer | 2021-08-27 10:08:49 +0200 | |
| commit | 9f6c24a887ee30ae27f42bc0ec26b0188b4c7fc7 (patch) | |
| tree | f8caaf07c4265d4e50a5d13a2dd34923889753ef /android/writedocs.go | |
| parent | 60dc5c0db29aed77aee195d0e5db608361a98d75 (diff) | |
Rename BuildDir and NinjaBuildDir.
These are just out/ and out/soong/ and the old names were quite
confusing.
Test: Presubmits.
Merged-In: I999ca62162062f27e449f83ffb00fa580d4065b8
Merged-In: I2fcd80a9e376a6842a06aa104a9f6f5c5e16f8c7
Change-Id: Ib481d2aac40df8da1b74174dc8ec576c1cb48be0
Diffstat (limited to 'android/writedocs.go')
| -rw-r--r-- | android/writedocs.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/writedocs.go b/android/writedocs.go index 67b9aa3ad..c380a3d84 100644 --- a/android/writedocs.go +++ b/android/writedocs.go @@ -34,12 +34,12 @@ func DocsSingleton() Singleton { type docsSingleton struct{} func primaryBuilderPath(ctx SingletonContext) Path { - buildDir := absolutePath(ctx.Config().BuildDir()) + soongOutDir := absolutePath(ctx.Config().SoongOutDir()) binary := absolutePath(os.Args[0]) - primaryBuilder, err := filepath.Rel(buildDir, binary) + primaryBuilder, err := filepath.Rel(soongOutDir, binary) if err != nil { ctx.Errorf("path to primary builder %q is not in build dir %q (%q)", - os.Args[0], ctx.Config().BuildDir(), err) + os.Args[0], ctx.Config().SoongOutDir(), err) } return PathForOutput(ctx, primaryBuilder) |