diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index e74c671fd73..0ba6b544c38 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -93,6 +93,13 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa new PrefabPreprocessingEntry( "react_render_core", new Pair("../ReactCommon/react/renderer/core/", "react/renderer/core/") + ), + new PrefabPreprocessingEntry( + "react_render_graphics", + [ + new Pair("../ReactCommon/react/renderer/graphics/", "react/renderer/graphics/"), + new Pair("../ReactCommon/react/renderer/graphics/platform/cxx/", ""), + ] ) ] ) @@ -355,7 +362,8 @@ android { "react_debug", "react_render_componentregistry", "react_newarchdefaults", - "react_render_core" + "react_render_core", + "react_render_graphics" } } ndk { @@ -450,6 +458,9 @@ android { react_render_core { headers(new File(prefabHeadersDir, "react_render_core").absolutePath) } + react_render_graphics { + headers(new File(prefabHeadersDir, "react_render_graphics").absolutePath) + } } publishing { diff --git a/ReactAndroid/cmake-utils/Android-prebuilt.cmake b/ReactAndroid/cmake-utils/Android-prebuilt.cmake index a43c0158da9..4048471cce0 100644 --- a/ReactAndroid/cmake-utils/Android-prebuilt.cmake +++ b/ReactAndroid/cmake-utils/Android-prebuilt.cmake @@ -103,17 +103,6 @@ target_include_directories(react_nativemodule_core ${REACT_COMMON_DIR}/react/nativemodule/core/platform/android) target_link_libraries(react_nativemodule_core INTERFACE folly_runtime) -## react_render_graphics -add_library(react_render_graphics SHARED IMPORTED GLOBAL) -set_target_properties(react_render_graphics - PROPERTIES - IMPORTED_LOCATION - ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_graphics.so) -target_include_directories(react_render_graphics - INTERFACE - ${REACT_COMMON_DIR}/react/renderer/graphics - ${REACT_COMMON_DIR}/react/renderer/graphics/platform/cxx) - ## react_render_imagemanager add_library(react_render_imagemanager SHARED IMPORTED GLOBAL) set_target_properties(react_render_imagemanager diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake index 50b66e66bdf..1d87f3d923a 100644 --- a/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -49,6 +49,7 @@ 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) add_library(react_render_core ALIAS ReactAndroid::react_render_core) +add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics) target_link_libraries(${CMAKE_PROJECT_NAME} fabricjni @@ -63,7 +64,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} react_render_componentregistry # prefab ready react_render_core # prefab ready react_render_debug # prefab ready - react_render_graphics + react_render_graphics # prefab ready react_render_mapbuffer rrc_view runtimeexecutor # prefab ready