diff --git a/React.podspec b/React.podspec index b493b13a29..337eff3baf 100644 --- a/React.podspec +++ b/React.podspec @@ -107,7 +107,7 @@ Pod::Spec.new do |s| ss.source_files = "ReactCommon/cxxreact/*.{cpp,h}" ss.exclude_files = "ReactCommon/cxxreact/{JSCTracing,SampleCxxModule}.*" ss.private_header_files = "ReactCommon/cxxreact/*.h" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\"" } + ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" } end s.subspec "ART" do |ss| diff --git a/third-party-podspecs/Folly.podspec b/third-party-podspecs/Folly.podspec index 19dc9765e9..d68dcd0563 100644 --- a/third-party-podspecs/Folly.podspec +++ b/third-party-podspecs/Folly.podspec @@ -13,14 +13,15 @@ Pod::Spec.new do |spec| spec.dependency 'GLog' spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1' spec.header_mappings_dir = 'folly' - spec.source_files = 'folly/*.h', - 'folly/Bits.cpp', + spec.source_files = 'folly/Bits.cpp', 'folly/Conv.cpp', 'folly/Demangle.cpp', 'folly/StringBase.cpp', 'folly/Unicode.cpp', 'folly/dynamic.cpp', 'folly/json.cpp' + # workaround for https://github.com/facebook/react-native/issues/14326 + spec.preserve_paths = 'folly/*.h' spec.libraries = "stdc++" spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", diff --git a/third-party-podspecs/GLog.podspec b/third-party-podspecs/GLog.podspec index f0db333358..0f402a8466 100644 --- a/third-party-podspecs/GLog.podspec +++ b/third-party-podspecs/GLog.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |spec| spec.source = { :git => 'https://github.com/google/glog.git', :tag => "v#{spec.version}" } spec.module_name = 'glog' - spec.source_files = 'src/**/*.h', + spec.source_files = 'src/glog/*.h', 'src/demangle.cc', 'src/logging.cc', 'src/raw_logging.cc', @@ -18,8 +18,10 @@ Pod::Spec.new do |spec| 'src/symbolize.cc', 'src/utilities.cc', 'src/vlog_is_on.cc' + # workaround for https://github.com/facebook/react-native/issues/14326 + spec.preserve_paths = 'src/*.h', + 'src/base/*.h' spec.exclude_files = "src/windows/**/*" - spec.public_header_files = "src/glog/*.h" spec.libraries = "stdc++" spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src" }