From bbfccd088b377d741a594a5eba73a087aaeb7093 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Mon, 17 Feb 2025 06:51:50 -0800 Subject: [PATCH] RNGP - Convert if to when in getPackagingOptionsForVariant (#49426) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/49426 This is a nit, but I'm following up on a review comment that was left behind. Changelog: [Internal] [Changed] - Reviewed By: cipolleschi Differential Revision: D69656370 fbshipit-source-id: 76de4d77d9993bd9a35d7df019a6cebcce13d632 --- .../react/utils/NdkConfiguratorUtils.kt | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt index 5e8303e465b..50e0ce0d547 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt @@ -125,21 +125,25 @@ internal object NdkConfiguratorUtils { ): Pair, List> { val excludes = mutableListOf() val includes = mutableListOf() - if (hermesEnabled) { - excludes.add("**/libjsc.so") - excludes.add("**/libjsctooling.so") - includes.add("**/libhermes.so") - includes.add("**/libhermestooling.so") - } else if (useThirdPartyJSC) { - excludes.add("**/libhermes.so") - excludes.add("**/libhermestooling.so") - excludes.add("**/libjsctooling.so") - includes.add("**/libjsc.so") - } else { - excludes.add("**/libhermes.so") - excludes.add("**/libhermestooling.so") - includes.add("**/libjsc.so") - includes.add("**/libjsctooling.so") + when { + hermesEnabled -> { + excludes.add("**/libjsc.so") + excludes.add("**/libjsctooling.so") + includes.add("**/libhermes.so") + includes.add("**/libhermestooling.so") + } + useThirdPartyJSC -> { + excludes.add("**/libhermes.so") + excludes.add("**/libhermestooling.so") + excludes.add("**/libjsctooling.so") + includes.add("**/libjsc.so") + } + else -> { + excludes.add("**/libhermes.so") + excludes.add("**/libhermestooling.so") + includes.add("**/libjsc.so") + includes.add("**/libjsctooling.so") + } } return excludes to includes }