Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57355683 authored by Liz Kammer's avatar Liz Kammer
Browse files

Temporarily disable cc_objects in mixed builds 

Bug: 181794963
Test: generate bp2build targets and run mixed builds
Change-Id: If4562fe8ed7bde88141b40166eca9d01f6538106
parent 05f72de0

cc/object.go

+2 −11
Original line number Diff line number Diff line
@@ -53,19 +53,10 @@ 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)

	// TODO(b/181794963): restore mixed builds once cc_object incompatibility resolved

	return false

}



		handler.module.outputFile = android.OptionalPathForPath(android.PathForBazelOut(ctx, objPaths[0]))

	}

	return ok

}



type ObjectLinkerProperties struct {

	// list of modules that should only provide headers for this module.

	Header_libs []string `android:"arch_variant,variant_prepend"`