Exclude Android HorizontalScrollContentView cxx component code (faceb…

…ook#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: facebook#48138 Test Plan: iOS don't include any Android HorizontalScrollContentView code. Reviewed By: christophpurrer Differential Revision: D67127853 Pulled By: NickGerleman fbshipit-source-id: 7901aa7bf62eada58d973e07e8a95e4d595c1ea5
zhongwuzw · Dec 12, 2024 · 4adaacb · 4adaacb
1 parent 49a594a
commit 4adaacb
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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/...talScrollContentViewComponentDescriptor.h → ...talScrollContentViewComponentDescriptor.h b/...talScrollContentViewComponentDescriptor.h → ...talScrollContentViewComponentDescriptor.h
diff --git a/...HorizontalScrollContentViewShadowNode.cpp → ...HorizontalScrollContentViewShadowNode.cpp b/...HorizontalScrollContentViewShadowNode.cpp → ...HorizontalScrollContentViewShadowNode.cpp
diff --git a/...idHorizontalScrollContentViewShadowNode.h → ...idHorizontalScrollContentViewShadowNode.h b/...idHorizontalScrollContentViewShadowNode.h → ...idHorizontalScrollContentViewShadowNode.h