From fc33ded4b3e2bc76f9213d09de21b62c7a86ebe4 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Mon, 15 Aug 2022 23:00:46 +0200 Subject: [PATCH] Further patch expo-modules-core According to this commit https://github.com/EdwardDrapkin/expo/commit/dee397b9ed6ce0709fb220f8cd29fa13f7ce0630 --- patches/expo-modules-core+0.11.3.patch | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/patches/expo-modules-core+0.11.3.patch b/patches/expo-modules-core+0.11.3.patch index 389a8d08..73d83135 100644 --- a/patches/expo-modules-core+0.11.3.patch +++ b/patches/expo-modules-core+0.11.3.patch @@ -1,13 +1,27 @@ diff --git a/node_modules/expo-modules-core/android/build.gradle b/node_modules/expo-modules-core/android/build.gradle -index a57c367..130a94f 100644 +index a57c367..13b4427 100644 --- a/node_modules/expo-modules-core/android/build.gradle +++ b/node_modules/expo-modules-core/android/build.gradle -@@ -422,7 +422,7 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) { +@@ -422,18 +422,16 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) { } // END FOLLy -task prepareHermes() { -+task prepareHermes(dependsOn: createNativeDepsDirectories) { ++task prepareHermes(dependsOn: createNativeDepsDirectories, type: Copy) { if (!FOR_HERMES) { return } + + def soFiles = zipTree(HERMES_AAR).matching({ it.include "**/*.so" }) + +- copy { +- from soFiles +- from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk" +- into "$thirdPartyNdkDir/hermes" +- } ++ from soFiles ++ from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk" ++ into "$thirdPartyNdkDir/hermes" + } + + task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly, prepareHermes]) {}