Skip to content

Commit e09ca7d

Browse files
Riccardo Cipolleschifacebook-github-bot
authored andcommitted
Cleanup React-Core
Summary: React-Core does not depends on any bit of ReactCommon, React-RCTFabric or React-NativeModuleApple, so I'm cleaning that up. ## Context Last week I helped macOS to work with static framework. When multiple platforms are specified, frameworks are build in two variants, the iOS and macOS one. This break all the HEADER_SEARCH_PATHS as now we have to properly specify the base folder from which the search path is generated. See also [this PR](microsoft#1967) where I manually make MacOS work with `use_framewroks!` ## Changelog: [Internal] - Add helper function to create header_search_path Differential Revision: D51030115
1 parent 81ab898 commit e09ca7d

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

packages/react-native/React-Core.podspec

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ socket_rocket_version = '0.7.0'
2222
boost_compiler_flags = '-Wno-documentation'
2323

2424
use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
25-
use_frameworks = ENV['USE_FRAMEWORKS'] != nil
2625

2726
header_subspecs = {
2827
'CoreModulesHeaders' => 'React/CoreModules/**/*.h',
@@ -40,8 +39,6 @@ header_subspecs = {
4039

4140
frameworks_search_paths = []
4241
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if use_hermes
43-
frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"" if use_frameworks
44-
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric\"" if use_frameworks
4542

4643
header_search_paths = [
4744
"$(PODS_TARGET_SRCROOT)/ReactCommon",
@@ -51,15 +48,10 @@ header_search_paths = [
5148
"$(PODS_ROOT)/RCT-Folly",
5249
"${PODS_ROOT}/Headers/Public/FlipperKit",
5350
"$(PODS_ROOT)/Headers/Public/ReactCommon",
54-
"$(PODS_ROOT)/Headers/Public/React-RCTFabric"
5551
].concat(use_hermes ? [
5652
"$(PODS_ROOT)/Headers/Public/React-hermes",
5753
"$(PODS_ROOT)/Headers/Public/hermes-engine"
58-
] : []).concat(use_frameworks ? [
59-
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers",
60-
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
61-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers"
62-
] : []).map{|p| "\"#{p}\""}.join(" ")
54+
] : [])
6355

6456
Pod::Spec.new do |s|
6557
s.name = "React-Core"

0 commit comments

Comments
 (0)