facebook#34214 for main

Kudo · Jul 25, 2022 · 11ee7b4 · 11ee7b4
1 parent a70354d
commit 11ee7b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/scripts/cocoapods/utils.rb b/scripts/cocoapods/utils.rb
@@ -93,6 +93,18 @@ def self.fix_library_search_paths(installer)
         end
     end
 
+    def self.fix_react_bridging_header_search_paths(installer)
+        installer.target_installation_results.pod_target_installation_results
+            .each do |pod_name, target_installation_result|
+                target_installation_result.native_target.build_configurations.each do |config|
+                    # For third party modules who have React-bridging dependency to search correct headers
+                    config.build_settings['HEADER_SEARCH_PATHS'] ||= '$(inherited) '
+                    config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging" '
+                    config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers" '
+            end
+        end
+    end
+
     def self.apply_mac_catalyst_patches(installer)
         # Fix bundle signing issues
         installer.pods_project.targets.each do |target|

diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb
@@ -156,6 +156,7 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re
 
   ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)
   ReactNativePodsUtils.fix_library_search_paths(installer)
+  ReactNativePodsUtils.fix_react_bridging_header_search_paths(installer)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)