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

Revert "Fix builds with absolute OUT_DIR"

Browse Source 
This reverts commit b1d1e0e6bd.

Reason for revert: b/162063775

Change-Id: Ifcdba9d918d2bd0b5ab7ab02ccdc727a844a5556
This commit is contained in:
Colin Cross
2020-07-24 20:47:24 +00:00
parent b1d1e0e6bd
commit fae4d517fc
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/prebuilt_build_tool.go
View File

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