Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f
am: 9771209aee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226 Change-Id: If8c4cc0709258983dfd88201aeee155ff3c92425
This commit is contained in:
@@ -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 {
|
||||||
|
Reference in New Issue
Block a user