Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fae4d517 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Fix builds with absolute OUT_DIR" 

This reverts commit b1d1e0e6.

Reason for revert: b/162063775

Change-Id: Ifcdba9d918d2bd0b5ab7ab02ccdc727a844a5556
parent b1d1e0e6

android/prebuilt_build_tool.go

+3 −9
Original line number Diff line number Diff line
@@ -59,15 +59,9 @@ func (t *prebuiltBuildTool) GenerateAndroidBuildActions(ctx ModuleContext) { 
	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())

	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.ModuleErrorf("Unabled to generate symlink between %q and %q: %s", installedPath.String(), sourcePath.String())

	}



	ctx.Build(pctx, BuildParams{