diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt index eefaef68a8735c..b14b138cc72b23 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt @@ -165,23 +165,23 @@ internal fun Project.configureReactTasks(variant: BaseVariant, config: ReactExte packageTask.configure { if (config.enableVmCleanup.get()) { val libDir = "$buildDir/intermediates/transforms/" - val targetVariant = ".*/transforms/[^/]*/$targetPath/.*".toRegex() + val targetVariant = ".*/transforms/[^/]*/${variant.name}/.*".toRegex() it.doFirst { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) } } } stripDebugSymbolsTask?.configure { if (config.enableVmCleanup.get()) { - val libDir = "$buildDir/intermediates/stripped_native_libs/${targetPath}/out/lib/" - val targetVariant = ".*/stripped_native_libs/$targetPath/out/lib/.*".toRegex() + val libDir = "$buildDir/intermediates/stripped_native_libs/${variant.name}/out/lib/" + val targetVariant = ".*/stripped_native_libs/${variant.name}/out/lib/.*".toRegex() it.doLast { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) } } } mergeNativeLibsTask?.configure { if (config.enableVmCleanup.get()) { - val libDir = "$buildDir/intermediates/merged_native_libs/${targetPath}/out/lib/" - val targetVariant = ".*/merged_native_libs/$targetPath/out/lib/.*".toRegex() + val libDir = "$buildDir/intermediates/merged_native_libs/${variant.name}/out/lib/" + val targetVariant = ".*/merged_native_libs/${variant.name}/out/lib/.*".toRegex() it.doLast { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) } } } diff --git a/react.gradle b/react.gradle index d9e27140aeaf94..528b7a0c36b10f 100644 --- a/react.gradle +++ b/react.gradle @@ -369,9 +369,9 @@ afterEvaluate { } } }.visit { details -> - def targetVariant1 = ".*/transforms/[^/]*/${targetPath}/.*" - def targetVariant2 = ".*/merged_native_libs/${targetPath}/out/lib/.*" - def targetVariant3 = ".*/stripped_native_libs/${targetPath}/out/lib/.*" + def targetVariant1 = ".*/transforms/[^/]*/${variant.name}/.*" + def targetVariant2 = ".*/merged_native_libs/${variant.name}/out/lib/.*" + def targetVariant3 = ".*/stripped_native_libs/${variant.name}/out/lib/.*" def path = details.file.getAbsolutePath().replace(File.separatorChar, '/' as char) if ((path.matches(targetVariant1) || path.matches(targetVariant2) || path.matches(targetVariant3)) && details.file.isFile()) { details.file.delete() @@ -386,13 +386,13 @@ afterEvaluate { def sTask = tasks.findByName("strip${targetName}DebugSymbols") if (sTask != null) { - def strippedLibDir = "$buildDir/intermediates/stripped_native_libs/${targetPath}/out/lib/" + def strippedLibDir = "$buildDir/intermediates/stripped_native_libs/${variant.name}/out/lib/" sTask.doLast { vmSelectionAction(strippedLibDir) } } def mTask = tasks.findByName("merge${targetName}NativeLibs") if (mTask != null) { - def mergedLibDir = "$buildDir/intermediates/merged_native_libs/${targetPath}/out/lib/" + def mergedLibDir = "$buildDir/intermediates/merged_native_libs/${variant.name}/out/lib/" mTask.doLast { vmSelectionAction(mergedLibDir) } } }