diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp index 2d6f8dc4e2c4..5313ba29a2bd 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h b/packages/react-native/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h index 2a3187c7610a..2206658cf24b 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h @@ -11,7 +11,6 @@ #include "RuntimeSamplingProfile.h" #include "TracingMode.h" -#include #include #include diff --git a/packages/react-native/ReactCommon/oscompat/CMakeLists.txt b/packages/react-native/ReactCommon/oscompat/CMakeLists.txt index 7340b3127751..7b223b0cff22 100644 --- a/packages/react-native/ReactCommon/oscompat/CMakeLists.txt +++ b/packages/react-native/ReactCommon/oscompat/CMakeLists.txt @@ -12,4 +12,7 @@ file(GLOB oscompat_SRC CONFIGURE_DEPENDS *.cpp) add_library(oscompat OBJECT ${oscompat_SRC}) target_include_directories(oscompat PUBLIC .) + +target_link_libraries(oscompat + react_cxxstableapi) target_compile_reactnative_options(oscompat PRIVATE) diff --git a/packages/react-native/ReactCommon/oscompat/OSCompat.h b/packages/react-native/ReactCommon/oscompat/OSCompat.h index 2eaf9b50c7bc..b32f2c5dc1a7 100644 --- a/packages/react-native/ReactCommon/oscompat/OSCompat.h +++ b/packages/react-native/ReactCommon/oscompat/OSCompat.h @@ -7,6 +7,8 @@ #pragma once +#include + #include namespace facebook::react::oscompat { diff --git a/packages/react-native/ReactCommon/oscompat/React-oscompat.podspec b/packages/react-native/ReactCommon/oscompat/React-oscompat.podspec index 73d033c29a43..6de1e9410cf1 100644 --- a/packages/react-native/ReactCommon/oscompat/React-oscompat.podspec +++ b/packages/react-native/ReactCommon/oscompat/React-oscompat.podspec @@ -16,6 +16,12 @@ else source[:tag] = "v#{version}" end +header_search_paths = [] + +if ENV['USE_FRAMEWORKS'] + header_search_paths << "\"$(PODS_TARGET_SRCROOT)/..\"" # ReactCommon, for +end + Pod::Spec.new do |s| s.name = "React-oscompat" s.version = version @@ -26,8 +32,10 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = podspec_sources("*.{cpp,h}", "*.{h}") - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.header_dir = "oscompat" + s.dependency "React-cxxstableapi" + mark_as_react_native_build(s) end