Merge "bp2build: do not convert prebuilt cc binaries"
diff --git a/cc/cc.go b/cc/cc.go
index 7211359..5c4edb9 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3453,19 +3453,27 @@
// ConvertWithBp2build converts Module to Bazel for bp2build.
func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
+ prebuilt := c.IsPrebuilt()
if c.Binary() {
- binaryBp2build(ctx, c, ctx.ModuleType())
+ if !prebuilt {
+ binaryBp2build(ctx, c, ctx.ModuleType())
+ }
} else if c.Object() {
- objectBp2Build(ctx, c)
+ if !prebuilt {
+ objectBp2Build(ctx, c)
+ }
} else if c.CcLibrary() {
static := c.BuildStaticVariant()
shared := c.BuildSharedVariant()
- prebuilt := c.IsPrebuilt()
if static && shared {
- libraryBp2Build(ctx, c)
+ if !prebuilt {
+ libraryBp2Build(ctx, c)
+ }
} else if !static && !shared {
- libraryHeadersBp2Build(ctx, c)
+ if !prebuilt {
+ libraryHeadersBp2Build(ctx, c)
+ }
} else if static {
if prebuilt {
prebuiltLibraryStaticBp2Build(ctx, c)
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 4c3c7b4..feae812 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -552,7 +552,7 @@
}
func NewPrebuiltBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator) {
- module, binary := NewBinary(hod)
+ module, binary := newBinary(hod, false)
module.compiler = nil
prebuilt := &prebuiltBinaryLinker{