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

Commit 25a43ee4 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Copy prebuilt objects to the intermediates directory" am: 8d0e466f 

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



Change-Id: If8205e1f4499d3dbb387419be42a6c1904cc7991
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02bea04b 8d0e466f

cc/prebuilt.go

+10 −1
Original line number Diff line number Diff line
@@ -527,7 +527,16 @@ var _ prebuiltLinkerInterface = (*prebuiltObjectLinker)(nil) 
func (p *prebuiltObjectLinker) link(ctx ModuleContext,

	flags Flags, deps PathDeps, objs Objects) android.Path {

	if len(p.properties.Srcs) > 0 {

		return p.Prebuilt.SingleSourcePath(ctx)

		// Copy objects to a name matching the final installed name

		in := p.Prebuilt.SingleSourcePath(ctx)

		outputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".o")

		ctx.Build(pctx, android.BuildParams{

			Rule:        android.CpExecutable,

			Description: "prebuilt",

			Output:      outputFile,

			Input:       in,

		})

		return outputFile

	}

	return nil

}