Temporarily disable cc_objects in mixed builds
Bug: 181794963 Test: generate bp2build targets and run mixed builds Change-Id: If4562fe8ed7bde88141b40166eca9d01f6538106
This commit is contained in:
parent
05f72de083
commit
57355683d4
13
cc/object.go
13
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 {
|
||||
|
|
Loading…
Reference in New Issue