fix internal and oss tests (#44947)

Summary: Pull Request resolved: #44947 # Changelog: [Internal] Differential Revision: D58586169
facebook · Jun 15, 2024 · 718398e · 718398e
1 parent fa645f2
commit 718398e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 18 deletions.
diff --git a/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt b/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt
@@ -23,4 +23,5 @@ target_link_libraries(jsinspector
         glog
         react_featureflags
         runtimeexecutor
+        reactperflogger
 )
diff --git a/packages/react-native/ReactCommon/jsinspector-modern/HostAgent.cpp b/packages/react-native/ReactCommon/jsinspector-modern/HostAgent.cpp
@@ -15,7 +15,7 @@
 
 #include <chrono>
 
-#include <fusebox/FuseboxTracer.h>
+#include <reactperflogger/fusebox/FuseboxTracer.h>
 
 using namespace std::chrono;
 using namespace std::literals::string_view_literals;

diff --git a/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.cpp b/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.cpp
@@ -13,9 +13,9 @@
 
 #include <cxxreact/JSExecutor.h>
 #include <cxxreact/ReactMarker.h>
-#include <fusebox/FuseboxTracer.h>
 #include <jsi/instrumentation.h>
 #include <react/performance/timeline/PerformanceEntryReporter.h>
+#include <reactperflogger/fusebox/FuseboxTracer.h>
 #include "NativePerformance.h"
 #include "Plugins.h"
 

diff --git a/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt b/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt
@@ -13,7 +13,12 @@ add_compile_options(
         -Wall
         -Wpedantic)
 
-file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS reactperflogger/*.cpp)
+
+file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS
+        reactperflogger/*.cpp
+        fusebox/*.cpp)
 add_library(reactperflogger STATIC ${reactperflogger_SRC})
 
 target_include_directories(reactperflogger PUBLIC .)
+
+target_link_libraries(reactperflogger folly_runtime)
diff --git a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec
@@ -19,7 +19,8 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-boost_compiler_flags = '-Wno-documentation'
+
+use_frameworks = ENV['USE_FRAMEWORKS'] != nil
 
 Pod::Spec.new do |s|
   s.name                   = "React-perflogger"
@@ -30,7 +31,17 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "**/*.{cpp,h}"
+  s.source_files           = "reactperflogger/*.{cpp,h}", "fusebox/*.{cpp,h}"
   s.header_dir             = "reactperflogger"
   s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }
+  s.compiler_flags         = folly_compiler_flags
+  s.pod_target_xcconfig    = {
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/RCT-Folly\"",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                               "DEFINES_MODULE" => "YES"
+  }.merge!(use_frameworks ? {
+    "PUBLIC_HEADERS_FOLDER_PATH" => "#{module_name}.framework/Headers/#{header_dir}"
+  } : {})
+
+  s.dependency "RCT-Folly", folly_version
 end
diff --git a/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.h b/packages/react-native/ReactCommon/reactperflogger/fusebox/FuseboxTracer.h
@@ -9,7 +9,7 @@
 
 #include <functional>
 #include <vector>
-#include "folly/json/dynamic.h"
+#include "folly/dynamic.h"
 
 namespace facebook::react {
 

diff --git a/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp b/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp
@@ -7,25 +7,14 @@
 
 #include <gtest/gtest.h>
 
-#include "fusebox/FuseboxTracer.h"
+#include <reactperflogger/fusebox/FuseboxTracer.h>
 
 using namespace ::testing;
 
 namespace facebook::react {
 
 namespace {
 
-folly::dynamic stopTracingAndCollect() {
-  folly::dynamic trace = folly::dynamic::array;
-  FuseboxTracer::getFuseboxTracer().stopTracing(
-      [&trace](const folly::dynamic& eventsChunk) {
-        for (const auto& event : eventsChunk) {
-          trace.push_back(event);
-        }
-      });
-  return trace;
-}
-
 class FuseboxTracerTest : public ::testing::Test {
  protected:
   FuseboxTracerTest() = default;
@@ -39,6 +28,17 @@ class FuseboxTracerTest : public ::testing::Test {
   void TearDown() override {
     stopTracingAndCollect();
   }
+
+  folly::dynamic stopTracingAndCollect() {
+    folly::dynamic trace = folly::dynamic::array;
+    FuseboxTracer::getFuseboxTracer().stopTracing(
+        [&trace](const folly::dynamic& eventsChunk) {
+          for (const auto& event : eventsChunk) {
+            trace.push_back(event);
+          }
+        });
+    return trace;
+  }
 };
 
 } // namespace