From 57355683d4f812e21cf479001742be9b10e2fc5e Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Tue, 16 Mar 2021 13:34:48 -0400 Subject: [PATCH] Temporarily disable cc_objects in mixed builds Bug: 181794963 Test: generate bp2build targets and run mixed builds Change-Id: If4562fe8ed7bde88141b40166eca9d01f6538106 --- cc/object.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cc/object.go b/cc/object.go index 126bd657b..f9e6d2df6 100644 --- a/cc/object.go +++ b/cc/object.go @@ -53,17 +53,8 @@ type objectBazelHandler struct { } func (handler *objectBazelHandler) generateBazelBuildActions(ctx android.ModuleContext, label string) bool { - bazelCtx := ctx.Config().BazelContext - objPaths, ok := bazelCtx.GetCcObjectFiles(label, ctx.Arch().ArchType) - 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 + // TODO(b/181794963): restore mixed builds once cc_object incompatibility resolved + return false } type ObjectLinkerProperties struct {