Skip to content

Commit 6796e62

Browse files
mhorowitzfacebook-github-bot
authored andcommitted
Remove JSC references
Summary: Removing entire files will be the next diff @public Reviewed By: fkgozali Differential Revision: D9328239 fbshipit-source-id: 083847d3b841a3c7bfa751a82e8cc16bd112bace
1 parent 53fa813 commit 6796e62

File tree

5 files changed

+7
-47
lines changed

5 files changed

+7
-47
lines changed

ReactAndroid/src/main/jni/react/jni/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_xplat_dep", "react_native_xplat_target", "rn_xplat_cxx_library")
22

33
EXPORTED_HEADERS = [
4-
"AndroidJSCFactory.h",
54
"CxxModuleWrapper.h",
65
"CxxModuleWrapperBase.h",
76
"CxxSharedModuleWrapper.h",
@@ -52,6 +51,7 @@ rn_xplat_cxx_library(
5251
],
5352
deps = ([
5453
"xplat//third-party/linker_lib:android",
54+
"xplat//third-party/linker_lib:atomic",
5555
"xplat//folly:molly",
5656
"fbandroid//xplat/fbgloginit:fbgloginit",
5757
"xplat//fbsystrace:fbsystrace",

ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <fb/glog_init.h>
1010
#include <fb/log.h>
1111

12-
#include "AndroidJSCFactory.h"
1312
#include "CatalystInstanceImpl.h"
1413
#include "CxxModuleWrapper.h"
1514
#include "JavaScriptExecutorHolder.h"
@@ -30,27 +29,6 @@ namespace react {
3029

3130
namespace {
3231

33-
// TODO: can we avoid these wrapper classes, and instead specialize the logic in CatalystInstanceImpl
34-
class JSCJavaScriptExecutorHolder : public HybridClass<JSCJavaScriptExecutorHolder,
35-
JavaScriptExecutorHolder> {
36-
public:
37-
static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JSCJavaScriptExecutor;";
38-
39-
static local_ref<jhybriddata> initHybrid(alias_ref<jclass>, ReadableNativeMap* jscConfig) {
40-
return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume()));
41-
}
42-
43-
static void registerNatives() {
44-
registerHybrid({
45-
makeNativeMethod("initHybrid", JSCJavaScriptExecutorHolder::initHybrid),
46-
});
47-
}
48-
49-
private:
50-
friend HybridBase;
51-
using HybridBase::HybridBase;
52-
};
53-
5432
struct JavaJSExecutor : public JavaClass<JavaJSExecutor> {
5533
static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JavaJSExecutor;";
5634
};
@@ -83,7 +61,6 @@ class ProxyJavaScriptExecutorHolder : public HybridClass<ProxyJavaScriptExecutor
8361
extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
8462
return initialize(vm, [] {
8563
gloginit::initialize();
86-
JSCJavaScriptExecutorHolder::registerNatives();
8764
ProxyJavaScriptExecutorHolder::registerNatives();
8865
CatalystInstanceImpl::registerNatives();
8966
CxxModuleWrapperBase::registerNatives();

ReactCommon/cxxreact/BUCK

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,15 @@ CXXREACT_PUBLIC_HEADERS = [
8080
"CxxNativeModule.h",
8181
"Instance.h",
8282
"JSBundleType.h",
83-
"JSExecutor.h",
84-
"JSCExecutor.h",
85-
"JSCNativeModules.h",
86-
"JSCUtils.h",
8783
"JSDeltaBundleClient.h",
84+
"JSExecutor.h",
8885
"JSIndexedRAMBundle.h",
8986
"JSModulesUnbundle.h",
9087
"MessageQueueThread.h",
9188
"MethodCall.h",
9289
"ModuleRegistry.h",
9390
"NativeModule.h",
9491
"NativeToJsBridge.h",
95-
"Platform.h",
9692
"RAMBundleRegistry.h",
9793
"ReactMarker.h",
9894
"RecoverableError.h",
@@ -126,11 +122,7 @@ rn_xplat_cxx_library(
126122
"-frtti",
127123
],
128124
fbandroid_deps = ANDROID_JSC_DEPS,
129-
fbandroid_preprocessor_flags = get_android_inspector_flags() + [
130-
"-DWITH_JSC_EXTRA_TRACING=1",
131-
"-DWITH_JSC_MEMORY_PRESSURE=1",
132-
"-DWITH_FB_MEMORY_PROFILING=1",
133-
],
125+
fbandroid_preprocessor_flags = get_android_inspector_flags(),
134126
fbobjc_compiler_flags = get_apple_compiler_flags(),
135127
fbobjc_deps = APPLE_JSC_DEPS,
136128
fbobjc_force_static = True,
@@ -156,12 +148,10 @@ rn_xplat_cxx_library(
156148
"xplat//folly:molly",
157149
":jsbigstring",
158150
":module",
159-
react_native_xplat_target("jschelpers:jschelpers"),
160151
react_native_xplat_target("jsinspector:jsinspector"),
161152
react_native_xplat_target("microprofiler:microprofiler"),
162153
"xplat//folly:optional",
163154
"xplat//third-party/glog:glog",
164-
react_native_xplat_target("jschelpers:jscinternalhelpers"),
165155
react_native_xplat_target("privatedata:privatedata"),
166156
],
167157
)

ReactCommon/cxxreact/tests/BUCK

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
load(
22
"//tools/build_defs/oss:rn_defs.bzl",
3-
"ANDROID_JSC_DEPS",
43
"APPLE",
5-
"APPLE_JSC_DEPS",
64
"fb_xplat_cxx_test",
75
"jni_instrumentation_test_lib",
86
"react_native_xplat_target",
@@ -12,10 +10,7 @@ TEST_SRCS = [
1210
"RecoverableErrorTest.cpp",
1311
"jsarg_helpers.cpp",
1412
"jsbigstring.cpp",
15-
"jscexecutor.cpp",
16-
"jsclogging.cpp",
1713
"methodcall.cpp",
18-
"value.cpp",
1914
]
2015

2116
jni_instrumentation_test_lib(
@@ -32,10 +27,11 @@ jni_instrumentation_test_lib(
3227
"fbandroid//instrumentation_tests/...",
3328
],
3429
deps = [
35-
"xplat//third-party/linker_lib:android",
3630
"xplat//third-party/gmock:gtest",
31+
"xplat//third-party/linker_lib:android",
32+
"xplat//third-party/linker_lib:atomic",
3733
react_native_xplat_target("cxxreact:bridge"),
38-
] + ANDROID_JSC_DEPS,
34+
],
3935
)
4036

4137
fb_xplat_cxx_test(
@@ -53,6 +49,5 @@ fb_xplat_cxx_test(
5349
"xplat//folly:molly",
5450
"xplat//third-party/gmock:gtest",
5551
react_native_xplat_target("cxxreact:bridge"),
56-
react_native_xplat_target("jschelpers:jschelpers"),
57-
] + APPLE_JSC_DEPS,
52+
],
5853
)

tools/build_defs/oss/rn_defs.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog"
2222

2323
INSPECTOR_FLAGS = []
2424

25-
APPLE_JSC_INTERNAL_DEPS = []
26-
2725
APPLE_JSC_DEPS = []
2826

2927
ANDROID_JSC_INTERNAL_DEPS = [

0 commit comments

Comments
 (0)