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

Commit e3f1644f authored by Dan Willemsen's avatar Dan Willemsen Committed by Automerger Merge Worker
Browse files

Merge "Fix builds with absolute OUT_DIR" am: e59bf511 

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

Change-Id: I28016af2afd944d35f692c076074f41349729f9d
parents b96c0267 e59bf511

android/prebuilt_build_tool.go

+9 −3
Original line number Diff line number Diff line
@@ -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())

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

			ctx.ModuleErrorf("Unable to generate symlink between %q and %q: %s", installedPath.String(), sourcePath.String(), err)

		}

	}



	ctx.Build(pctx, BuildParams{