StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If8205e1f4499d3dbb387419be42a6c1904cc7991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-04-20 00:21:34 +00:00
committed by Automerger Merge Worker
parent 02bea04bf0 8d0e466f19
commit 25a43ee488
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cc/prebuilt.go
View File

@@ -527,7 +527,16 @@ var _ prebuiltLinkerInterface = (*prebuiltObjectLinker)(nil)
func (p *prebuiltObjectLinker) link(ctx ModuleContext, func (p *prebuiltObjectLinker) link(ctx ModuleContext,
flags Flags, deps PathDeps, objs Objects) android.Path { flags Flags, deps PathDeps, objs Objects) android.Path {
if len(p.properties.Srcs) > 0 { 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 return nil
} }