Merge "Handle absolute source paths correctly." (a9a99bc6) · Commits · e / os / android_build_soong

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,
		},
		})

+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,
		},
		})