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

Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205

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

Change-Id: I7097cbeda45737ebec339ec4d4a51f4ea3d3fa7d
This commit is contained in:
Liz Kammer
2021-03-16 21:54:54 +00:00
committed by Automerger Merge Worker
parent 2b6af78207 39d3830205
commit f84f690929
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/object.go
View File

@@ -53,17 +53,8 @@ type objectBazelHandler struct {
} }
func (handler *objectBazelHandler) generateBazelBuildActions(ctx android.ModuleContext, label string) bool { func (handler *objectBazelHandler) generateBazelBuildActions(ctx android.ModuleContext, label string) bool {
bazelCtx := ctx.Config().BazelContext // TODO(b/181794963): restore mixed builds once cc_object incompatibility resolved
objPaths, ok := bazelCtx.GetCcObjectFiles(label, ctx.Arch().ArchType) return false
if ok {
if len(objPaths) != 1 {
ctx.ModuleErrorf("expected exactly one object file for '%s', but got %s", label, objPaths)
return false
}
handler.module.outputFile = android.OptionalPathForPath(android.PathForBazelOut(ctx, objPaths[0]))
}
return ok
} }
type ObjectLinkerProperties struct { type ObjectLinkerProperties struct {