diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index a0484a9f6f36e8..c339b9d13616af 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -86,6 +86,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa "react_render_componentregistry", new Pair("../ReactCommon/react/renderer/componentregistry/", "react/renderer/componentregistry/") ), + new PrefabPreprocessingEntry( + "react_newarchdefaults", + new Pair("src/main/jni/react/newarchdefaults", "") + ) ] ) it.outputDir.set(prefabHeadersDir) @@ -338,7 +342,6 @@ android { "jsijniprofiler", "reactnativeblob", "reactperfloggerjni", - "react_newarchdefaults", "fabricjni", // prefab targets "react_render_debug", @@ -346,7 +349,8 @@ android { "runtimeexecutor", "react_codegen_rncore", "react_debug", - "react_render_componentregistry" + "react_render_componentregistry", + "react_newarchdefaults" } } ndk { @@ -435,6 +439,9 @@ android { react_render_componentregistry { headers(new File(prefabHeadersDir, "react_render_componentregistry").absolutePath) } + react_newarchdefaults { + headers(new File(prefabHeadersDir, "react_newarchdefaults").absolutePath) + } } publishing { diff --git a/ReactAndroid/cmake-utils/Android-prebuilt.cmake b/ReactAndroid/cmake-utils/Android-prebuilt.cmake index 18ee6bd6ad9e9c..d9331596f6c4b8 100644 --- a/ReactAndroid/cmake-utils/Android-prebuilt.cmake +++ b/ReactAndroid/cmake-utils/Android-prebuilt.cmake @@ -168,14 +168,6 @@ set_target_properties(fabricjni ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfabricjni.so) target_include_directories(fabricjni INTERFACE ${REACT_ANDROID_SRC_DIR}/jni/react/fabric) -## react_newarchdefaults -add_library(react_newarchdefaults SHARED IMPORTED GLOBAL) -set_target_properties(react_newarchdefaults - PROPERTIES - IMPORTED_LOCATION - ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_newarchdefaults.so) -target_include_directories(react_newarchdefaults INTERFACE ${REACT_ANDROID_SRC_DIR}/jni/react/newarchdefaults) - ## jsi add_library(jsi SHARED IMPORTED GLOBAL) set_target_properties(jsi diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake index dfcbfd7dd73340..57bcc3d6a32699 100644 --- a/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -47,6 +47,7 @@ add_library(runtimeexecutor ALIAS ReactAndroid::runtimeexecutor) add_library(react_codegen_rncore ALIAS ReactAndroid::react_codegen_rncore) add_library(react_debug ALIAS ReactAndroid::react_debug) add_library(react_render_componentregistry ALIAS ReactAndroid::react_render_componentregistry) +add_library(react_newarchdefaults ALIAS ReactAndroid::react_newarchdefaults) target_link_libraries(${CMAKE_PROJECT_NAME} fabricjni @@ -57,7 +58,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} react_codegen_rncore # prefab ready react_debug # prefab ready react_nativemodule_core - react_newarchdefaults + react_newarchdefaults # prefab ready react_render_componentregistry # prefab ready react_render_core react_render_debug # prefab ready