Merge "Disable mixed builds for unsupported variants"

This commit is contained in:
Treehugger Robot 2023-06-23 18:25:01 +00:00 committed by Gerrit Code Review
commit cc1a519b86

View file

@ -25,6 +25,7 @@ import (
"strings"
"android/soong/ui/metrics/bp2build_metrics_proto"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
@ -1922,9 +1923,37 @@ func (c *Module) IsMixedBuildSupported(ctx android.BaseModuleContext) bool {
//TODO(b/278772861) support sanitizers in Bazel rules
return false
}
if !imageVariantSupportedByBazel(c) {
return false
}
if c.IsSdkVariant() {
return false
}
return c.bazelHandler != nil
}
func imageVariantSupportedByBazel(c *Module) bool {
if c.IsLlndk() {
return false
}
if c.InVendor() {
return false
}
if c.InProduct() {
return false
}
if c.InRamdisk() {
return false
}
if c.InVendorRamdisk() {
return false
}
if c.InRecovery() {
return false
}
return true
}
func allEnabledSanitizersSupportedByBazel(ctx android.BaseModuleContext, c *Module) bool {
if c.sanitize == nil {
return true