From 58bbbff4d75b4cc70c1f3aa196277f562e02a291 Mon Sep 17 00:00:00 2001 From: Wojciech Lewicki Date: Fri, 12 Jul 2024 02:10:05 -0700 Subject: [PATCH] feat: expose prefabs for newly added targets (#45386) Summary: In recent commits, some new targets have been added, and they are not exposed as prefabs, yet are used in e.g. `TextLayoutManager`. They are needed then for `react-native-live-markdown`: https://github.com/Expensify/react-native-live-markdown/pull/428/commits/c1611cd98ed5009fd66c871b9999b55941086af0 ## Changelog: [ANDROID] [ADDED] - expose prefabs for newly added targets Pull Request resolved: https://github.com/facebook/react-native/pull/45386 Test Plan: It cannot be tested inside the repo, but try to build the `example` app with new arch enabled on `Android` in the `react-native-live-markdown` repo to see that those are needed. Reviewed By: NickGerleman Differential Revision: D59638801 Pulled By: cortinico fbshipit-source-id: 3d09507d72a0c4d3dbb3a2a81b753625230a04a3 --- .../ReactAndroid/build.gradle.kts | 28 +++++++++++++++++++ .../cmake-utils/ReactNative-application.cmake | 5 ++++ 2 files changed, 33 insertions(+) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 76d41a679a6..1efd8b930b9 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -110,6 +110,22 @@ val preparePrefab by Pair("../ReactCommon/react/renderer/graphics/", "react/renderer/graphics/"), Pair("../ReactCommon/react/renderer/graphics/platform/android/", ""), )), + PrefabPreprocessingEntry( + "react_render_consistency", + Pair( + "../ReactCommon/react/renderer/consistency/", "react/renderer/consistency/")), + PrefabPreprocessingEntry( + "react_featureflags", + Pair("../ReactCommon/react/featureflags/", "react/featureflags/")), + PrefabPreprocessingEntry( + "react_performance_timeline", + Pair( + "../ReactCommon/react/performance/timeline/", "react/performance/timeline/")), + PrefabPreprocessingEntry( + "react_render_observers_events", + Pair( + "../ReactCommon/react/renderer/observers/events/", + "react/renderer/observers/events/")), PrefabPreprocessingEntry( "rrc_root", Pair( @@ -694,6 +710,18 @@ android { create("react_render_graphics") { headers = File(prefabHeadersDir, "react_render_graphics").absolutePath } + create("react_render_consistency") { + headers = File(prefabHeadersDir, "react_render_consistency").absolutePath + } + create("react_featureflags") { + headers = File(prefabHeadersDir, "react_featureflags").absolutePath + } + create("react_performance_timeline") { + headers = File(prefabHeadersDir, "react_performance_timeline").absolutePath + } + create("react_render_observers_events") { + headers = File(prefabHeadersDir, "react_render_observers_events").absolutePath + } create("rrc_image") { headers = File(prefabHeadersDir, "rrc_image").absolutePath } create("rrc_root") { headers = File(prefabHeadersDir, "rrc_root").absolutePath } create("rrc_view") { headers = File(prefabHeadersDir, "rrc_view").absolutePath } diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake index 468b5c1c975..de13935766f 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -87,6 +87,11 @@ 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) add_library(rrc_legacyviewmanagerinterop ALIAS ReactAndroid::rrc_legacyviewmanagerinterop) +add_library(reactnativejni ALIAS ReactAndroid::reactnativejni) +add_library(react_render_consistency ALIAS ReactAndroid::react_render_consistency) +add_library(react_performance_timeline ALIAS ReactAndroid::react_performance_timeline) +add_library(react_render_observers_events ALIAS ReactAndroid::react_render_observers_events) +add_library(react_featureflags ALIAS ReactAndroid::react_featureflags) find_package(fbjni REQUIRED CONFIG) add_library(fbjni ALIAS fbjni::fbjni)