Revert "Fix builds with absolute OUT_DIR"
This reverts commit b1d1e0e6bd0f4034752a7c7d15f44e967c485d7b.
Reason for revert: b/162063775
Change-Id: Ifcdba9d918d2bd0b5ab7ab02ccdc727a844a5556
diff --git a/android/prebuilt_build_tool.go b/android/prebuilt_build_tool.go
index d457da4..a9f29ef 100644
--- a/android/prebuilt_build_tool.go
+++ b/android/prebuilt_build_tool.go
@@ -59,15 +59,9 @@
installedPath := PathForModuleOut(ctx, t.ModuleBase.Name())
deps := PathsForModuleSrc(ctx, t.properties.Deps)
- 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)
- }
+ 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())
}
ctx.Build(pctx, BuildParams{