Merge "Avoid direct access to Native_bridge_supported property"

This commit is contained in:
Paul Duffin
2021-09-15 13:29:32 +00:00
committed by Gerrit Code Review

View File

@@ -631,8 +631,7 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) {
image := base.commonProperties.ImageVariation image := base.commonProperties.ImageVariation
// Filter NativeBridge targets unless they are explicitly supported. // Filter NativeBridge targets unless they are explicitly supported.
// Skip creating native bridge variants for non-core modules. // Skip creating native bridge variants for non-core modules.
if os == Android && if os == Android && !(base.IsNativeBridgeSupported() && image == CoreVariation) {
!(Bool(base.commonProperties.Native_bridge_supported) && image == CoreVariation) {
var targets []Target var targets []Target
for _, t := range osTargets { for _, t := range osTargets {