Skip to content

Commit 11ee7b4

Browse files
committed
facebook#34214 for main
1 parent a70354d commit 11ee7b4

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

scripts/cocoapods/utils.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,18 @@ def self.fix_library_search_paths(installer)
9393
end
9494
end
9595

96+
def self.fix_react_bridging_header_search_paths(installer)
97+
installer.target_installation_results.pod_target_installation_results
98+
.each do |pod_name, target_installation_result|
99+
target_installation_result.native_target.build_configurations.each do |config|
100+
# For third party modules who have React-bridging dependency to search correct headers
101+
config.build_settings['HEADER_SEARCH_PATHS'] ||= '$(inherited) '
102+
config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging" '
103+
config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers" '
104+
end
105+
end
106+
end
107+
96108
def self.apply_mac_catalyst_patches(installer)
97109
# Fix bundle signing issues
98110
installer.pods_project.targets.each do |target|

scripts/react_native_pods.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re
156156

157157
ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)
158158
ReactNativePodsUtils.fix_library_search_paths(installer)
159+
ReactNativePodsUtils.fix_react_bridging_header_search_paths(installer)
159160
ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
160161

161162
NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)

0 commit comments

Comments
 (0)