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

Merge "Fix builds with absolute OUT_DIR"

Browse Source
This commit is contained in:
Dan Willemsen
2020-07-24 08:56:18 +00:00
committed by Gerrit Code Review
parent 3992b7c486 b1d1e0e6bd
commit e59bf5118d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/prebuilt_build_tool.go
View File

@@ -59,9 +59,15 @@ func (t *prebuiltBuildTool) GenerateAndroidBuildActions(ctx ModuleContext) {
installedPath := PathForModuleOut(ctx, t.ModuleBase.Name())
deps := PathsForModuleSrc(ctx, t.properties.Deps)
relPath, err := filepath.Rel(path.Dir(installedPath.String()), sourcePath.String())
if err != nil {
ctx.ModuleErrorf("Unabled to generate symlink between %q and %q: %s", installedPath.String(), sourcePath.String())
var relPath string
if filepath.IsAbs(installedPath.String()) {
relPath = filepath.Join(absSrcDir, sourcePath.String())
} else {
var err error
relPath, err = filepath.Rel(path.Dir(installedPath.String()), sourcePath.String())
if err != nil {
ctx.ModuleErrorf("Unable to generate symlink between %q and %q: %s", installedPath.String(), sourcePath.String(), err)
}
}
ctx.Build(pctx, BuildParams{