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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user