Move RuntimeExecutor to its own BUCK module (#28730)

Emily Janzer · facebook-github-bot · commit 79d5b20ced38 · 2020-04-27T11:39:07.000-07:00
Summary: Pull Request resolved: #28730 Moving RuntimeExecutor out of react/utils and into its own subdir of ReactCommon. I'm doing this because I'm going to be pulling this into CatalystInstance on Android, and I don't want to pull in all the files we don't need there; also, this should hopefully make the OSS NDK stuff easier (this uses the react/utils prefix to export, and I'm not sure if you can include a '/' in a gradle module name?) Changelog: [Internal] Reviewed By: shergin, mdvacca Differential Revision: D21098528 fbshipit-source-id: 9fbd72901ece522b1caec3ec34fafb8f9b327275
diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h
@@ -10,8 +10,8 @@
 #import <React/RCTPrimitives.h>
 #import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTSurfaceStage.h>
+#import <ReactCommon/RuntimeExecutor.h>
 #import <react/utils/ContextContainer.h>
-#import <react/utils/RuntimeExecutor.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
@@ -17,9 +17,9 @@
 #import <React/RCTSurfacePresenter.h>
 #import <React/RCTSurfacePresenterStub.h>
 
+#import <ReactCommon/RuntimeExecutor.h>
 #import <react/utils/ContextContainer.h>
 #import <react/utils/ManagedObjectWrapper.h>
-#import <react/utils/RuntimeExecutor.h>
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h
@@ -9,8 +9,8 @@
 
 #include <CoreFoundation/CFRunLoop.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include <ReactCommon/RuntimeExecutor.h>
 #include <react/core/EventBeat.h>
-#include <react/utils/RuntimeExecutor.h>
 
 namespace facebook {
 namespace react {
diff --git a/React/Fabric/Utils/RuntimeEventBeat.h b/React/Fabric/Utils/RuntimeEventBeat.h
@@ -7,8 +7,8 @@
 
 #include <CoreFoundation/CFRunLoop.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include <ReactCommon/RuntimeExecutor.h>
 #include <react/core/EventBeat.h>
-#include <react/utils/RuntimeExecutor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/scheduler:scheduler"),
         react_native_xplat_target("fabric/componentregistry:componentregistry"),
         react_native_xplat_target("fabric/components/scrollview:scrollview"),
-        react_native_xplat_target("utils:utils"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_target("jni/react/jni:jni"),
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/folly:molly",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h
@@ -10,9 +10,9 @@
 #include <mutex>
 #include <unordered_set>
 
+#include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
 #include <react/core/EventBeat.h>
-#include <react/utils/RuntimeExecutor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/scheduler/Scheduler.h b/ReactCommon/fabric/scheduler/Scheduler.h
@@ -10,6 +10,7 @@
 #include <memory>
 #include <mutex>
 
+#include <ReactCommon/RuntimeExecutor.h>
 #include <react/componentregistry/ComponentDescriptorFactory.h>
 #include <react/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/components/root/RootComponentDescriptor.h>
@@ -21,7 +22,6 @@
 #include <react/uimanager/UIManagerBinding.h>
 #include <react/uimanager/UIManagerDelegate.h>
 #include <react/utils/ContextContainer.h>
-#include <react/utils/RuntimeExecutor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/scheduler/SchedulerToolbox.h b/ReactCommon/fabric/scheduler/SchedulerToolbox.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include <ReactCommon/RuntimeExecutor.h>
 #include <react/componentregistry/ComponentDescriptorFactory.h>
 #include <react/core/EventBeat.h>
 #include <react/utils/ContextContainer.h>
-#include <react/utils/RuntimeExecutor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
@@ -63,7 +63,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/componentregistry:componentregistry"),
         react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("utils:utils"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
     ],
 )
 
diff --git a/ReactCommon/runtimeexecutor/.clang-tidy b/ReactCommon/runtimeexecutor/.clang-tidy
@@ -0,0 +1,5 @@
+---
+Checks: '>
+clang-diagnostic-*,
+'
+...
diff --git a/ReactCommon/runtimeexecutor/BUCK b/ReactCommon/runtimeexecutor/BUCK
@@ -0,0 +1,53 @@
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "rn_xplat_cxx_library",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "runtimeexecutor",
+    srcs = glob(
+        [
+            "**/*.cpp",
+            "**/*.mm",
+        ],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = {
+        "ReactCommon/RuntimeExecutor.h": "ReactCommon/RuntimeExecutor.h",
+    },
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_frameworks = ["Foundation"],
+    fbobjc_labels = ["supermodule:ios/default/public.react_native.infra"],
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/jsi:jsi",
+    ],
+)
diff --git a/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h b/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ rn_xplat_cxx_library(`
`63`	`63`	`react_native_xplat_target("fabric/core:core"),`
`64`	`64`	`react_native_xplat_target("fabric/componentregistry:componentregistry"),`
`65`	`65`	`react_native_xplat_target("fabric/debug:debug"),`
`66`		`- react_native_xplat_target("utils:utils"),`
	`66`	`+ react_native_xplat_target("runtimeexecutor:runtimeexecutor"),`
`67`	`67`	`],`
`68`	`68`	`)`
`69`	`69`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +Checks: '>
 +clang-diagnostic-*,
 +'
 +...