Skip to content

Cover oscompat with Stable API guards (#57960) #57960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-piasecki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cover oscompat with Stable API guards (#57960) #57960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <folly/executors/QueuedImmediateExecutor.h>
#include <jsinspector-modern/InspectorFlags.h>
#include <oscompat/OSCompat.h>
#include <react/featureflags/ReactNativeFeatureFlags.h>
#include <react/networking/NetworkReporter.h>

Expand Down
1 change: 0 additions & 1 deletion packages/react-native/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "RuntimeSamplingProfile.h"
#include "TracingMode.h"

#include <oscompat/OSCompat.h>
#include <react/timing/primitives.h>

#include <vector>
Expand Down
3 changes: 3 additions & 0 deletions packages/react-native/ReactCommon/oscompat/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/oscompat/OSCompat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/PrivateGuard.h>

#include <cstdint>

namespace facebook::react::oscompat {
Expand Down
10 changes: 9 additions & 1 deletion packages/react-native/ReactCommon/oscompat/React-oscompat.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <react/cxxstableapi/...>
end

Pod::Spec.new do |s|
s.name = "React-oscompat"
s.version = version
Expand All @@ -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
Loading