Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732 am: 227e8e9493 am: 8ac144c6e6

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

Change-Id: Iff33eedc973c18eb99ee0de60548c8272b525104

cc/object.go

@@ -53,8 +53,17 @@ type objectBazelHandler struct {
 }
 
 func (handler *objectBazelHandler) generateBazelBuildActions(ctx android.ModuleContext, label string) bool {
-	// TODO(b/181794963): restore mixed builds once cc_object incompatibility resolved
-	return false
+	bazelCtx := ctx.Config().BazelContext
+	objPaths, ok := bazelCtx.GetOutputFiles(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
 }
 
 type ObjectLinkerProperties struct {