Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f am: 9771209aee am: 517e3e9673

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: Ib1bf51dd7c1986d51b4f732969a0d53210bb7d3a
This commit is contained in:
Paul Duffin
2021-09-15 14:13:55 +00:00
committed by Automerger Merge Worker

View File

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