summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cc/prebuilt.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 598031914..1f9c3fe51 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -510,7 +510,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
}