diff --git a/FabricTestExample/package.json b/FabricTestExample/package.json index 1305b7b1fc..25ae055394 100644 --- a/FabricTestExample/package.json +++ b/FabricTestExample/package.json @@ -8,7 +8,8 @@ "start": "react-native start", "test": "jest", "lint": "eslint .", - "check-types": "tsc --noEmit" + "check-types": "tsc --noEmit", + "postinstall": "patch-package" }, "dependencies": { "@react-navigation/bottom-tabs": "^6.3.1", @@ -20,7 +21,9 @@ "react-native-codegen": "^0.0.13", "react-native-gesture-handler": "^2.4.2", "react-native-safe-area-context": "^4.2.5", - "react-native-screens": "link:../" + "react-native-screens": "link:../", + "patch-package": "^6.4.7", + "postinstall-postinstall": "^2.1.0" }, "devDependencies": { "@babel/core": "^7.12.9", diff --git a/FabricTestExample/patches/react-native-safe-area-context+4.2.5.patch b/FabricTestExample/patches/react-native-safe-area-context+4.2.5.patch new file mode 100644 index 0000000000..b255db0bf8 --- /dev/null +++ b/FabricTestExample/patches/react-native-safe-area-context+4.2.5.patch @@ -0,0 +1,34 @@ +diff --git a/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk b/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk +index 6166527..33a7e73 100644 +--- a/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk ++++ b/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk +@@ -20,7 +20,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni + LOCAL_SHARED_LIBRARIES := libjsi \ + libfbjni \ + libglog \ +- libfolly_json \ ++ libfolly_runtime \ + libyoga \ + libreact_nativemodule_core \ + libturbomodulejsijni \ +@@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := libjsi \ + libreact_render_core \ + libreact_render_graphics \ + libfabricjni \ +- libfolly_futures \ + libreact_debug \ + libreact_render_componentregistry \ + libreact_render_debug \ +diff --git a/node_modules/react-native-safe-area-context/common/cpp/Android.mk b/node_modules/react-native-safe-area-context/common/cpp/Android.mk +index a7680a6..69d86d6 100644 +--- a/node_modules/react-native-safe-area-context/common/cpp/Android.mk ++++ b/node_modules/react-native-safe-area-context/common/cpp/Android.mk +@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac + + LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/safeareacontext + +-LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libfbjni libturbomodulejsijni libreact_codegen_rncore libreact_debug libreact_render_debug libreact_render_mapbuffer libreact_codegen_safeareacontext ++LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_runtime libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libfbjni libturbomodulejsijni libreact_codegen_rncore libreact_debug libreact_render_debug libreact_render_mapbuffer libreact_codegen_safeareacontext + + LOCAL_CFLAGS := \ + -DLOG_TAG=\"ReactNative\" \ No newline at end of file