Merge "Disable mixed builds for unsupported variants" am: cc1a519b86 am: daa138e83c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2634949 Change-Id: Ib5aaac65443e1c77490a9cec6b0f5e49e8aa0f45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
29
cc/cc.go
29
cc/cc.go
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user