Merge "Disable mixed builds for unsupported variants"
diff --git a/cc/cc.go b/cc/cc.go
index 7bc8341..69d65e5 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -25,6 +25,7 @@
"strings"
"android/soong/ui/metrics/bp2build_metrics_proto"
+
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
@@ -1922,9 +1923,37 @@
//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