openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix writedocs." am: dfa33be445 am: 9632e13c5a am: e108ab7b8d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c8c6bd34c3977b97f3aa4a5ee8d550283ec0b85
This commit is contained in:
Lukács T. Berki 2021-03-11 09:30:20 +00:00 committed by Automerger Merge Worker
parent 4c02c2c337 e108ab7b8d
commit 8da97ecddc
1 changed files with 4 additions and 3 deletions
Show Stats 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 {
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 {
ctx.Errorf("path to primary builder %q is not in build dir %q",
os.Args[0], ctx.Config().BuildDir())
ctx.Errorf("path to primary builder %q is not in build dir %q (%q)",
os.Args[0], ctx.Config().BuildDir(), err)
}
return PathForOutput(ctx, primaryBuilder)