StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix writedocs." am: dfa33be445

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2b8770caae1621e09d4efacdfffd8d334ac387c
This commit is contained in:
Lukács T. Berki
2021-03-11 07:52:06 +00:00
committed by Automerger Merge Worker
parent d922efecce dfa33be445
commit 9632e13c5a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/writedocs.go
View File

@@ -35,10 +35,11 @@ type docsSingleton struct{}
func primaryBuilderPath(ctx SingletonContext) Path { func primaryBuilderPath(ctx SingletonContext) Path {
buildDir := absolutePath(ctx.Config().BuildDir()) buildDir := absolutePath(ctx.Config().BuildDir())
primaryBuilder, err := filepath.Rel(buildDir, os.Args[0]) binary := absolutePath(os.Args[0])
primaryBuilder, err := filepath.Rel(buildDir, binary)
if err != nil { if err != nil {
ctx.Errorf("path to primary builder %q is not in build dir %q", ctx.Errorf("path to primary builder %q is not in build dir %q (%q)",
os.Args[0], ctx.Config().BuildDir()) os.Args[0], ctx.Config().BuildDir(), err)
} }
return PathForOutput(ctx, primaryBuilder) return PathForOutput(ctx, primaryBuilder)