Expose react_render_imagemanager to consuming builds

Summary: This change will expose the `react_render_imagemanager` module to be consumed via Prefab by user projects. This is needed as part of a change of the codegen to support custom states. Changelog: [Internal] [Changed] - Expose react_render_imagemanager to consuming build Reviewed By: cipolleschi Differential Revision: D40022929 fbshipit-source-id: ece47503b11a641067ae6db82f1d69b244c9c5be
facebook · Oct 6, 2022 · e13aaaa · e13aaaa
1 parent 138c88c
commit e13aaaa
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
@@ -163,6 +163,13 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair("src/main/jni/react/jni", "react/jni/"),
                 ]
             ),
+            new PrefabPreprocessingEntry(
+                "react_render_imagemanager",
+                [
+                    new Pair("../ReactCommon/react/renderer/imagemanager/", "react/renderer/imagemanager/"),
+                    new Pair("../ReactCommon/react/renderer/imagemanager/platform/cxx/", ""),
+                ]
+            ),
         ]
     )
     it.outputDir.set(prefabHeadersDir)
@@ -413,7 +420,8 @@ android {
                     "react_render_mapbuffer",
                     "yoga",
                     "folly_runtime",
-                    "react_nativemodule_core"
+                    "react_nativemodule_core",
+                    "react_render_imagemanager"
             }
         }
         ndk {
@@ -530,6 +538,9 @@ android {
         react_nativemodule_core {
             headers(new File(prefabHeadersDir, "react_nativemodule_core").absolutePath)
         }
+        react_render_imagemanager {
+            headers(new File(prefabHeadersDir, "react_render_imagemanager").absolutePath)
+        }
     }
 
     publishing {

diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake
@@ -67,7 +67,8 @@ add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
 add_library(yoga ALIAS ReactAndroid::yoga)
 add_library(folly_runtime ALIAS ReactAndroid::folly_runtime)
 add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
-# 3rd party prefab packages
+add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
+
 find_package(fbjni REQUIRED CONFIG)
 add_library(fbjni ALIAS fbjni::fbjni)
 
@@ -85,6 +86,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         react_render_core                   # prefab ready
         react_render_debug                  # prefab ready
         react_render_graphics               # prefab ready
+        react_render_imagemanager           # prefab ready
         react_render_mapbuffer              # prefab ready
         rrc_view                            # prefab ready
         runtimeexecutor                     # prefab ready

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -92,6 +92,7 @@ LOCAL_SHARED_LIBRARIES := libfbjni \
   libreact_render_core \
   libreact_render_debug \
   libreact_render_graphics \
+  libreact_render_imagemanager \
   libreact_render_mapbuffer \
   librrc_view \
   libturbomodulejsijni \
@@ -140,6 +141,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga

diff --git a/...ve-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/...ve-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -54,7 +54,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -93,6 +93,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -165,7 +166,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -204,6 +205,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -269,7 +271,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/cxx_only_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -308,6 +310,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -380,7 +383,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -419,6 +422,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -491,7 +495,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -530,6 +534,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -610,7 +615,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -649,6 +654,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -721,7 +727,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -760,6 +766,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga
@@ -840,7 +847,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -879,6 +886,7 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
   rrc_view
   turbomodulejsijni
   yoga