Merge "bp2build: do not convert prebuilt cc binaries" (b29852a3) · Commits · e / os / android_build_soong

cc/cc.go

+13 −5

Original line number	Diff line number	Diff line
		@@ -3453,19 +3453,27 @@ var _ snapshot.RelativeInstallPath = (*Module)(nil)

		// ConvertWithBp2build converts Module to Bazel for bp2build.
		func (c *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
		prebuilt := c.IsPrebuilt()
		if c.Binary() {
		if !prebuilt {
		binaryBp2build(ctx, c, ctx.ModuleType())
		}
		} else if c.Object() {
		if !prebuilt {
		objectBp2Build(ctx, c)
		}
		} else if c.CcLibrary() {
		static := c.BuildStaticVariant()
		shared := c.BuildSharedVariant()
		prebuilt := c.IsPrebuilt()

		if static && shared {
		if !prebuilt {
		libraryBp2Build(ctx, c)
		}
		} else if !static && !shared {
		if !prebuilt {
		libraryHeadersBp2Build(ctx, c)
		}
		} else if static {
		if prebuilt {
		prebuiltLibraryStaticBp2Build(ctx, c)

+1 −1

Original line number	Diff line number	Diff line
		@@ -552,7 +552,7 @@ func prebuiltBinaryFactory() android.Module {
		}

		func NewPrebuiltBinary(hod android.HostOrDeviceSupported) (Module, binaryDecorator) {
		module, binary := NewBinary(hod)
		module, binary := newBinary(hod, false)
		module.compiler = nil

		prebuilt := &prebuiltBinaryLinker{