react-native 0.69.0-rc.6 → 0.70.0-rc.0

package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp

@@ -11,11 +11,10 @@
 #include <mutex>
 
 #include <fb/log.h>
+#include <fbjni/NativeRunnable.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 
-#include "JNativeRunnable.h"
-
 namespace facebook {
 namespace react {
 
@@ -69,11 +68,10 @@ void JMessageQueueThread::runOnQueue(std::function<void()> &&runnable) {
   jni::ThreadScope guard;
   static auto method =
       JavaMessageQueueThread::javaClassStatic()
-          ->getMethod<jboolean(Runnable::javaobject)>("runOnQueue");
-  method(
-      m_jobj,
-      JNativeRunnable::newObjectCxxArgs(wrapRunnable(std::move(runnable)))
-          .get());
+          ->getMethod<jboolean(JRunnable::javaobject)>("runOnQueue");
+  auto jrunnable =
+      JNativeRunnable::newObjectCxxArgs(wrapRunnable(std::move(runnable)));
+  method(m_jobj, jrunnable.get());
 }
 
 void JMessageQueueThread::runOnQueueSync(std::function<void()> &&runnable) {

package/ReactAndroid/src/main/jni/react/jni/NativeTime.cpp

@@ -12,8 +12,14 @@ namespace facebook {
 namespace react {
 
 double reactAndroidNativePerformanceNowHook() {
-  auto time = std::chrono::system_clock::now().time_since_epoch();
-  return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+  auto time = std::chrono::steady_clock::now();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                      time.time_since_epoch())
+                      .count();
+
+  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+  return duration / NANOSECONDS_IN_MILLISECOND;
 }
 
 } // namespace react

package/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK

@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "logging",
     autoglob = False,
+    language = "JAVA",
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         react_native_dep("libraries/fresco/fresco-react-native:fbcore"),

package/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK

@@ -28,6 +28,7 @@ fb_native.remote_file(
 rn_android_library(
     name = "imagepipeline",
     autoglob = False,
+    language = "JAVA",
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":bolts",
@@ -73,7 +74,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "nativeimagefilters-aar",
     sha1 = "4a30438df8d960000b37b1f8cdba9d7996d57ea9",
     url = "mvn:com.facebook.fresco:nativeimagefilters:aar:2.5.0",
@@ -85,7 +86,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "nativeimagetranscoder-aar",
     sha1 = "7db353c68b41e2ad502a959c554387d59e75eb75",
     url = "mvn:com.facebook.fresco:nativeimagetranscoder:aar:2.5.0",
@@ -145,7 +146,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "memory-type-ashmem-aar",
     sha1 = "b43b53aca89569fd2e8e964b71dc7afbf62204e8",
     url = "mvn:com.facebook.fresco:memory-type-ashmem:aar:2.5.0",
@@ -157,7 +158,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "memory-type-java-aar",
     sha1 = "57537a8b69dbad44fafdaea3067a776e11586465",
     url = "mvn:com.facebook.fresco:memory-type-java:aar:2.5.0",
@@ -169,7 +170,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "memory-type-native-aar",
     sha1 = "7eb7c52ee2a4d40b7f706c90069549410236aaa5",
     url = "mvn:com.facebook.fresco:memory-type-native:aar:2.5.0",
@@ -181,7 +182,7 @@ rn_android_prebuilt_aar(
     visibility = ["//ReactAndroid/..."],
 )
 
-remote_file(
+fb_native.remote_file(
     name = "ui-common-aar",
     sha1 = "224851cf4c074aeff5dc42861b557870459a9d28",
     url = "mvn:com.facebook.fresco:ui-common:aar:2.5.0",

package/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK

@@ -28,17 +28,17 @@ fb_native.android_prebuilt_aar(
 fb_native.remote_file(
     name = "annotation-binary.jar",
     sha1 = "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
-    url = "mvn:com.facebook.soloader:annotation:jar:0.10.3",
+    url = "mvn:com.facebook.soloader:annotation:jar:0.10.4",
 )
 
 fb_native.remote_file(
     name = "nativeloader-binary.jar",
     sha1 = "171783d0f3f525fb9e18eb3af758c0b3aaeaed69",
-    url = "mvn:com.facebook.soloader:nativeloader:jar:0.10.3",
+    url = "mvn:com.facebook.soloader:nativeloader:jar:0.10.4",
 )
 
 fb_native.remote_file(
     name = "soloader-binary-aar",
-    sha1 = "7f5d7fb7dd272fd016e32c278e6950258ebb8e22",
-    url = "mvn:com.facebook.soloader:soloader:aar:0.10.3",
+    sha1 = "3fda45c99faf58310107fb8c0857e6a671b89854",
+    url = "mvn:com.facebook.soloader:soloader:aar:0.10.4",
 )

package/ReactAndroid/src/main/res/views/uimanager/values/ids.xml

@@ -15,6 +15,12 @@
   <!--tag is used to store accessibilityRole tag-->
   <item type="id" name="accessibility_role"/>
 
+  <!--tag is used to store accessibilityCollection -->
+  <item type="id" name="accessibility_collection"/>
+
+  <!--tag is used to store accessibilityCollectionItem -->
+  <item type="id" name="accessibility_collection_item"/>
+
   <!--tag is used to store accessibilityState -->
   <item type="id" name="accessibility_state"/>
 
@@ -34,11 +40,14 @@
 
   <!-- tag is used to store if a view is subscribed to the pointerenter event -->
   <item type="id" name="pointer_enter"/>
+  <item type="id" name="pointer_enter_capture"/>
 
   <!-- tag is used to store if a view is subscribed to the pointerleave event -->
   <item type="id" name="pointer_leave"/>
+  <item type="id" name="pointer_leave_capture"/>
 
   <!-- tag is used to store if a view is subscribed to the pointermove event -->
   <item type="id" name="pointer_move"/>
-</resources>
+  <item type="id" name="pointer_move_capture"/>
 
+</resources>

package/ReactCommon/React-Fabric.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
 react_native_path = ".."

package/ReactCommon/{react/bridging/React-bridging.podspec → React-bridging.podspec}

@@ -5,7 +5,7 @@
 
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 
 Pod::Spec.new do |s|
   s.name                   = "React-bridging"
@@ -28,9 +28,10 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
-  s.source_files           = "**/*.{cpp,h}"
-  s.exclude_files          = "tests"
+  s.source_files           = "react/bridging/**/*.{cpp,h}"
+  s.exclude_files          = "react/bridging/tests"
   s.header_dir             = "react/bridging"
+  s.header_mappings_dir    = "."
   s.compiler_flags         = folly_compiler_flags
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"",
                                "USE_HEADERMAP" => "YES",

package/ReactCommon/ReactCommon.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 

package/ReactCommon/butter/BUCK

@@ -47,7 +47,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
     ],

package/ReactCommon/callinvoker/React-callinvoker.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/cxxreact/BUCK

@@ -1,5 +1,5 @@
 load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "get_android_inspector_flags", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_preprocessor_flags_for_build_mode", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "get_android_inspector_flags", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_preprocessor_flags_for_build_mode", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
     name = "module",
@@ -127,7 +127,7 @@ rn_xplat_cxx_library(
         "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
-    platforms = (ANDROID, APPLE),
+    platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -140,13 +140,12 @@ rn_xplat_cxx_library(
         ":jsbigstring",
         ":module",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
+        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:jsi",
         react_native_xplat_target("callinvoker:callinvoker"),
         react_native_xplat_target("jsinspector:jsinspector"),
-        react_native_xplat_target("microprofiler:microprofiler"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
         react_native_xplat_target("logger:logger"),

package/ReactCommon/cxxreact/JSBigString.h

@@ -82,7 +82,7 @@ class RN_EXPORT JSBigBufferString : public JSBigString {
     m_data[m_size] = '\0';
   }
 
-  ~JSBigBufferString() {
+  ~JSBigBufferString() override {
     delete[] m_data;
   }
 
@@ -111,7 +111,7 @@ class RN_EXPORT JSBigBufferString : public JSBigString {
 class RN_EXPORT JSBigFileString : public JSBigString {
  public:
   JSBigFileString(int fd, size_t size, off_t offset = 0);
-  ~JSBigFileString();
+  ~JSBigFileString() override;
 
   bool isAscii() const override {
     return true;

package/ReactCommon/cxxreact/JSExecutor.h

@@ -128,7 +128,8 @@ class RN_EXPORT JSExecutor {
    */
   virtual std::string getDescription() = 0;
 
-  virtual void handleMemoryPressure(__unused int pressureLevel) {}
+  virtual void handleMemoryPressure(__attribute__((unused)) int pressureLevel) {
+  }
 
   virtual void destroy() {}
   virtual ~JSExecutor() {}

package/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -52,7 +52,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   void callNativeModules(
-      __unused JSExecutor &executor,
+      __attribute__((unused)) JSExecutor &executor,
       folly::dynamic &&calls,
       bool isEndOfBatch) override {
     CHECK(m_registry || calls.empty())
@@ -85,7 +85,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   MethodCallResult callSerializableNativeHook(
-      __unused JSExecutor &executor,
+      __attribute__((unused)) JSExecutor &executor,
       unsigned int moduleId,
       unsigned int methodId,
       folly::dynamic &&args) override {

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -18,7 +18,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,9 +16,9 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 69;
+  int32_t Minor = 70;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.6";
+  std::string_view Prerelease = "rc.0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/cxxreact/tests/BUCK

@@ -1,70 +1,28 @@
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
     "APPLE",
+    "CXX",
     "fb_xplat_cxx_test",
-    "jni_instrumentation_test_lib",
     "react_native_xplat_target",
 )
 
-TEST_SRCS = [
-    "RecoverableErrorTest.cpp",
-    "jsarg_helpers.cpp",
-    "jsbigstring.cpp",
-    "methodcall.cpp",
-]
-
-jni_instrumentation_test_lib(
-    name = "tests",
-    srcs = TEST_SRCS,
-    class_under_test = "com/facebook/react/XplatBridgeTest",
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-    ],
-    soname = "libxplat-bridge.so",
-    visibility = [
-        "//fbandroid/instrumentation_tests/...",
-    ],
-    deps = [
-        "//xplat/folly:dynamic",
-        "//xplat/third-party/gmock:gtest",
-        "//xplat/third-party/linker_lib:android",
-        "//xplat/third-party/linker_lib:atomic",
-        react_native_xplat_target("cxxreact:bridge"),
-        react_native_xplat_target("cxxreact:jsbigstring"),
-    ],
-)
-
 fb_xplat_cxx_test(
     name = "tests",
-    srcs = TEST_SRCS,
+    srcs = glob(["*.cpp"]),
     compiler_flags = [
         "-fexceptions",
         "-frtti",
     ],
-    platforms = APPLE,
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE, CXX),
     visibility = [
         react_native_xplat_target("cxxreact/..."),
     ],
     deps = [
-        "//xplat/folly:molly",
+        "//xplat/folly:init_init",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:jsbigstring"),
     ],
 )
-
-fb_xplat_cxx_test(
-    name = "jsbigstring_test",
-    srcs = ["jsbigstring.cpp"],
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-    ],
-    deps = [
-        "//xplat/folly:molly",
-        "//xplat/third-party/gmock:gtest",
-        react_native_xplat_target("cxxreact:jsbigstring"),
-    ],
-)

package/ReactCommon/cxxreact/tests/jsarg_helpers.cpp

@@ -12,9 +12,8 @@
 #include <gtest/gtest.h>
 #include <algorithm>
 
-using namespace std;
-using namespace folly;
 using namespace facebook::xplat;
+using dynamic = folly::dynamic;
 
 #define EXPECT_JSAE(statement, exstr)                                         \
   do {                                                                        \
@@ -30,10 +29,10 @@ TEST(JsArgumentHelpersTest, args) {
   const bool aBool = true;
   const int64_t anInt = 17;
   const double aDouble = 3.14;
-  const string aString = "word";
+  const std::string aString = "word";
   const dynamic anArray = dynamic::array("a", "b", "c");
   const dynamic anObject = dynamic::object("k1", "v1")("k2", "v2");
-  const string aNumericString = to<string>(anInt);
+  const std::string aNumericString = folly::to<std::string>(anInt);
 
   folly::dynamic args = dynamic::array(
       aBool, anInt, aDouble, aString, anArray, anObject, aNumericString);

package/ReactCommon/cxxreact/tests/jsbigstring.cpp

@@ -12,7 +12,6 @@
 #include <folly/File.h>
 #include <gtest/gtest.h>
 
-using namespace facebook;
 using namespace facebook::react;
 
 namespace {
@@ -62,45 +61,3 @@ TEST(JSBigFileString, MapPartTest) {
     EXPECT_EQ(needle[i], bigStr.c_str()[i]);
   }
 }
-
-TEST(JSBigFileString, RemapTest) {
-  static const uint8_t kRemapMagic[] = {
-      0xc6, 0x1f, 0xbc, 0x03, 0xc1, 0x03, 0x19, 0x1f, 0xa1, 0xd0, 0xeb, 0x73};
-  std::string data(std::begin(kRemapMagic), std::end(kRemapMagic));
-  auto app = [&data](uint16_t v) {
-    data.append(reinterpret_cast<char *>(&v), sizeof(v));
-  };
-  size_t pageSizeLog2 = 16;
-  app(pageSizeLog2);
-  size_t pageSize = 1 << pageSizeLog2;
-  app(1); // header pages
-  app(2); // num mappings
-  // file page 0 -> memory page 1
-  app(1); // memory page
-  app(1); // num pages
-  // file page 1 -> memory page 0
-  app(0); // memory page
-  app(1); // num pages
-  while (data.size() < pageSize) {
-    app(0);
-  }
-  while (data.size() < pageSize * 2) {
-    app(0x1111);
-  }
-  while (data.size() < pageSize * 3) {
-    app(0x2222);
-  }
-
-  int fd = tempFileFromString(data);
-  JSBigFileString bigStr{fd, data.size()};
-
-  EXPECT_EQ(pageSize * 2, bigStr.size());
-  auto remapped = bigStr.c_str();
-  size_t i = 0;
-  for (; i < pageSize; ++i) {
-    EXPECT_EQ(0x22, remapped[i]);
-  }
-  for (; i < pageSize * 2; ++i) {
-    EXPECT_EQ(0x11, remapped[i]);
-  }
-}

package/{ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java → ReactCommon/cxxreact/tests/main.cpp}

@@ -5,10 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.testing.idledetection;
+#include <folly/init/Init.h>
+#include <gtest/gtest.h>
 
-/** Interface for something that knows how to wait for bridge and UI idle. */
-public interface IdleWaiter {
-
-  void waitForBridgeAndUIIdle();
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  folly::init(&argc, &argv);
+  return RUN_ALL_TESTS();
 }

package/ReactCommon/cxxreact/tests/methodcall.cpp

@@ -13,9 +13,8 @@
 #include <gtest/gtest.h>
 #pragma GCC diagnostic pop
 
-using namespace facebook;
 using namespace facebook::react;
-using namespace folly;
+using dynamic = folly::dynamic;
 
 TEST(parseMethodCalls, SingleReturnCallNoArgs) {
   auto jsText = "[[7],[3],[[]]]";

package/ReactCommon/hermes/React-hermes.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -171,7 +171,7 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
 
   ~DecoratedRuntime() {
 #ifdef HERMES_ENABLE_DEBUGGER
-    facebook::hermes::inspector::chrome::disableDebugging(hermesRuntime_);
+    facebook::hermes::inspector::chrome::disableDebugging(*runtime_);
 #endif
   }
 

package/ReactCommon/hermes/inspector/BUCK

@@ -2,7 +2,7 @@ load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary
 load("@fbsource//tools/build_defs:fb_xplat_cxx_library.bzl", "fb_xplat_cxx_library")
 load("@fbsource//tools/build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
 load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
-load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_target")
+load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "get_hermes_shared_library_preprocessor_flags", "react_native_xplat_target")
 load("@fbsource//xplat/hermes/defs:hermes.bzl", "hermes_build_mode", "hermes_optimize_flag")
 
 CFLAGS_BY_MODE = {
@@ -195,6 +195,7 @@ fb_xplat_cxx_library(
     labels = ["supermodule:xplat/default/public.hermes"],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
+    preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     visibility = [
         "PUBLIC",
     ],

package/ReactCommon/hermes/inspector/RuntimeAdapter.h

@@ -66,7 +66,7 @@ class INSPECTOR_EXPORT SharedRuntimeAdapter : public RuntimeAdapter {
   SharedRuntimeAdapter(
       std::shared_ptr<jsi::Runtime> runtime,
       debugger::Debugger &debugger);
-  virtual ~SharedRuntimeAdapter();
+  ~SharedRuntimeAdapter() override;
 
   jsi::Runtime &getRuntime() override;
   debugger::Debugger &getDebugger() override;

package/ReactCommon/hermes/inspector/chrome/ConnectionDemux.cpp

@@ -94,7 +94,7 @@ int ConnectionDemux::enableDebugging(
       std::make_shared<Connection>(std::move(adapter), title, waitForDebugger));
 }
 
-void ConnectionDemux::disableDebugging(HermesRuntime &runtime) {
+void ConnectionDemux::disableDebugging(jsi::Runtime &runtime) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   for (auto &it : conns_) {

package/ReactCommon/hermes/inspector/chrome/ConnectionDemux.h

@@ -39,7 +39,7 @@ class ConnectionDemux {
   int enableDebugging(
       std::unique_ptr<RuntimeAdapter> adapter,
       const std::string &title);
-  void disableDebugging(HermesRuntime &runtime);
+  void disableDebugging(jsi::Runtime &runtime);
 
  private:
   int addPage(std::shared_ptr<Connection> conn);

package/ReactCommon/hermes/inspector/chrome/Registration.cpp

@@ -28,7 +28,7 @@ void enableDebugging(
   demux().enableDebugging(std::move(adapter), title);
 }
 
-void disableDebugging(HermesRuntime &runtime) {
+void disableDebugging(jsi::Runtime &runtime) {
   demux().disableDebugging(runtime);
 }
 

package/ReactCommon/hermes/inspector/chrome/Registration.h

@@ -31,7 +31,7 @@ extern void enableDebugging(
  * disableDebugging removes this runtime from the list of debuggable JS targets
  * in this process.
  */
-extern void disableDebugging(HermesRuntime &runtime);
+extern void disableDebugging(jsi::Runtime &runtime);
 
 } // namespace chrome
 } // namespace inspector

package/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js

@@ -70,7 +70,7 @@ export class HeaderWriter {
     this.stream.write('struct UnknownRequest;\n\n');
 
     const namespaceMap: Map<string, Array<Type | Command | Event>> = new Map();
-    const addToMap = function (type) {
+    const addToMap = function (type: Type | Command | Event) {
       const domain = type.domain;
       let types = namespaceMap.get(domain);
       if (!types) {