From 4adaacb4f7cd136d5534c81fb9b8f5f2a0312d7f Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Thu, 12 Dec 2024 14:50:59 -0800 Subject: [PATCH] Exclude Android HorizontalScrollContentView cxx component code (#48138) Summary: Exclude Android HorizontalScrollContentView cxx component code, iOS don't need it. cc NickGerleman can you help to review? :) ## Changelog: [IOS] [FIXED] - Exclude Android HorizontalScrollContentView cxx component code Pull Request resolved: https://github.com/facebook/react-native/pull/48138 Test Plan: iOS don't include any Android HorizontalScrollContentView code. Reviewed By: christophpurrer Differential Revision: D67127853 Pulled By: NickGerleman fbshipit-source-id: 7901aa7bf62eada58d973e07e8a95e4d595c1ea5 --- .../react-native/ReactCommon/React-FabricComponents.podspec | 3 +-- .../react/renderer/components/scrollview/CMakeLists.txt | 4 ++-- .../AndroidHorizontalScrollContentViewComponentDescriptor.h | 0 .../AndroidHorizontalScrollContentViewShadowNode.cpp | 0 .../AndroidHorizontalScrollContentViewShadowNode.h | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename packages/react-native/ReactCommon/react/renderer/components/scrollview/{ => platform/android/react/renderer/components/scrollview}/AndroidHorizontalScrollContentViewComponentDescriptor.h (100%) rename packages/react-native/ReactCommon/react/renderer/components/scrollview/{ => platform/android/react/renderer/components/scrollview}/AndroidHorizontalScrollContentViewShadowNode.cpp (100%) rename packages/react-native/ReactCommon/react/renderer/components/scrollview/{ => platform/android/react/renderer/components/scrollview}/AndroidHorizontalScrollContentViewShadowNode.h (100%) diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index d8ff12b5d41..c8a38c79cec 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -136,8 +136,7 @@ Pod::Spec.new do |s| ss.subspec "scrollview" do |sss| sss.dependency folly_dep_name, folly_version sss.compiler_flags = folly_compiler_flags - sss.source_files = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}" - sss.exclude_files = "react/renderer/components/scrollview/tests" + sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/scrollview" end diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt index 4e58b4d1c90..f15f1df8ebd 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt @@ -14,10 +14,10 @@ add_compile_options( -Wpedantic -DLOG_TAG=\"Fabric\") -file(GLOB rrc_scrollview_SRC CONFIGURE_DEPENDS *.cpp) +file(GLOB rrc_scrollview_SRC CONFIGURE_DEPENDS *.cpp platform/android/react/renderer/components/scrollview/*.cpp) add_library(rrc_scrollview STATIC ${rrc_scrollview_SRC}) -target_include_directories(rrc_scrollview PUBLIC ${REACT_COMMON_DIR}) +target_include_directories(rrc_scrollview PUBLIC ${REACT_COMMON_DIR} . ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/) target_link_libraries(rrc_scrollview glog diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h similarity index 100% rename from packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h rename to packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp similarity index 100% rename from packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp rename to packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h similarity index 100% rename from packages/react-native/ReactCommon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h rename to packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h