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

Commit 14ee8322 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Handle absolute source paths correctly. 

Can happen if OUT_DIR is set on an absolute path.

Test: env RBE_remote_disabled=true OUT_DIR=/home_2/tmp/out m
Bug: 169048540
Fixes: 169048540
Change-Id: Ia6b91b13142d84e54d0dee8b4e04a91ad2cecc36
parent 7ede442a

android/prebuilt_build_tool.go

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


package android



import "path/filepath"



func init() {

	RegisterModuleType("prebuilt_build_tool", prebuiltBuildToolFactory)

}
@@ -58,13 +60,18 @@ func (t *prebuiltBuildTool) GenerateAndroidBuildActions(ctx ModuleContext) { 
	installedPath := PathForModuleOut(ctx, t.ModuleBase.Name())

	deps := PathsForModuleSrc(ctx, t.properties.Deps)



	var fromPath = sourcePath.String()

	if !filepath.IsAbs(fromPath) {

		fromPath = "$$PWD/" + fromPath

	}



	ctx.Build(pctx, BuildParams{

		Rule:      Symlink,

		Output:    installedPath,

		Input:     sourcePath,

		Implicits: deps,

		Args: map[string]string{

			"fromPath": "$$PWD/" + sourcePath.String(),

			"fromPath": fromPath,

		},

	})

cc/prebuilt.go

+7 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package cc 


import (

	"android/soong/android"

	"path/filepath"

)



func init() {
@@ -360,13 +361,18 @@ func (p *prebuiltBinaryLinker) link(ctx ModuleContext, 
			sharedLibPaths = append(sharedLibPaths, deps.SharedLibs...)

			sharedLibPaths = append(sharedLibPaths, deps.LateSharedLibs...)



			var fromPath = in.String()

			if !filepath.IsAbs(fromPath) {

				fromPath = "$$PWD/" + fromPath

			}



			ctx.Build(pctx, android.BuildParams{

				Rule:      android.Symlink,

				Output:    outputFile,

				Input:     in,

				Implicits: sharedLibPaths,

				Args: map[string]string{

					"fromPath": "$$PWD/" + in.String(),

					"fromPath": fromPath,

				},

			})