From 73bcedb903c330fddca1cab40bc501cc073a4872 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 6 Oct 2022 16:41:46 -0700 Subject: [PATCH] Expose rrc_image to consuming builds Summary: This change will expose the rrc_image 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 rrc_image to consuming build Reviewed By: cipolleschi Differential Revision: D40098541 fbshipit-source-id: 2e07d8b19f53ba93920009603c95a43b01f131eb --- ReactAndroid/build.gradle | 8 +++++++ .../cmake-utils/ReactNative-application.cmake | 2 ++ .../generators/modules/GenerateModuleJniH.js | 2 ++ .../GenerateModuleJniH-test.js.snap | 24 ++++++++++++------- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index b56fccc9ec1..bfa996cf64a 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -170,6 +170,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa new Pair("../ReactCommon/react/renderer/imagemanager/platform/cxx/", ""), ] ), + new PrefabPreprocessingEntry( + "rrc_image", + new Pair("../ReactCommon/react/renderer/components/image/", "react/renderer/components/image/") + ), ] ) it.outputDir.set(prefabHeadersDir) @@ -413,6 +417,7 @@ android { "react_newarchdefaults", "react_render_core", "react_render_graphics", + "rrc_image", "rrc_view", "jsi", "glog", @@ -514,6 +519,9 @@ android { react_render_graphics { headers(new File(prefabHeadersDir, "react_render_graphics").absolutePath) } + rrc_image { + headers(new File(prefabHeadersDir, "rrc_image").absolutePath) + } rrc_view { headers(new File(prefabHeadersDir, "rrc_view").absolutePath) } diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake index fbef8131d17..78cf9dfd0f1 100644 --- a/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -68,6 +68,7 @@ add_library(yoga ALIAS ReactAndroid::yoga) add_library(folly_runtime ALIAS ReactAndroid::folly_runtime) add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core) add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager) +add_library(rrc_image ALIAS ReactAndroid::rrc_image) find_package(fbjni REQUIRED CONFIG) add_library(fbjni ALIAS fbjni::fbjni) @@ -88,6 +89,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} react_render_graphics # prefab ready react_render_imagemanager # prefab ready react_render_mapbuffer # prefab ready + rrc_image # prefab ready rrc_view # prefab ready runtimeexecutor # prefab ready turbomodulejsijni # prefab ready diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js index 9547ed25896..bdedd8615a9 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js @@ -94,6 +94,7 @@ LOCAL_SHARED_LIBRARIES := libfbjni \ libreact_render_graphics \ libreact_render_imagemanager \ libreact_render_mapbuffer \ + librrc_image \ librrc_view \ libturbomodulejsijni \ libyoga @@ -142,6 +143,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap index 8ea384d07c9..26467d5eb84 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap +++ b/packages/react-native-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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -94,6 +94,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -166,7 +167,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -206,6 +207,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -271,7 +273,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -311,6 +313,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -383,7 +386,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -423,6 +426,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -495,7 +499,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -535,6 +539,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -615,7 +620,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -655,6 +660,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -727,7 +733,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -767,6 +773,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga @@ -847,7 +854,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_imagemanager 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_image librrc_view libturbomodulejsijni libyoga LOCAL_CFLAGS := \\\\ -DLOG_TAG=\\\\\\"ReactNative\\\\\\" @@ -887,6 +894,7 @@ target_link_libraries( react_render_debug react_render_graphics react_render_imagemanager + rrc_image rrc_view turbomodulejsijni yoga