diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK index a6ec7615d8f..43fa1a28ee2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK @@ -1,4 +1,4 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library") +load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library") rn_android_library( name = "jscexecutor", @@ -13,29 +13,8 @@ rn_android_library( "PUBLIC", ], deps = [ - ":jni", + react_native_target("jni/react/jscexecutor:jni"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), react_native_target("java/com/facebook/react/bridge:bridge"), ], ) - -rn_xplat_cxx_library( - name = "jni", - srcs = glob(["*.cpp"]), - headers = glob(["*.h"]), - header_namespace = "", - compiler_flags_enable_exceptions = True, # TODO: is this necessary? - compiler_flags_enable_rtti = True, # TODO: is this necessary? - fbandroid_allow_jni_merging = True, - platforms = ANDROID, - soname = "libjscexecutor.$(ext)", - visibility = [ - react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"), - ], - deps = [ - FBJNI_TARGET, - react_native_target("jni/react/jni:jni"), - react_native_xplat_target("jsi:JSCRuntime"), - react_native_xplat_target("jsiexecutor:jsiexecutor"), - ], -) diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt index bd0a7727c76..90115fd3187 100644 --- a/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/CMakeLists.txt @@ -96,7 +96,7 @@ add_react_android_subdir(src/main/jni/first-party/fbgloginit) add_react_android_subdir(src/main/jni/first-party/yogajni) add_react_android_subdir(src/main/jni/react/jni) add_react_android_subdir(src/main/jni/react/reactperflogger) -add_react_android_subdir(src/main/java/com/facebook/react/jscexecutor) +add_react_android_subdir(src/main/jni/react/jscexecutor) add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni) add_react_android_subdir(src/main/jni/react/uimanager) add_react_android_subdir(src/main/java/com/facebook/react/common/mapbuffer/jni) diff --git a/ReactAndroid/src/main/jni/react/jscexecutor/BUCK b/ReactAndroid/src/main/jni/react/jscexecutor/BUCK new file mode 100644 index 00000000000..7719f27dbc9 --- /dev/null +++ b/ReactAndroid/src/main/jni/react/jscexecutor/BUCK @@ -0,0 +1,22 @@ +load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_target", "react_native_xplat_target", "rn_xplat_cxx_library") + +rn_xplat_cxx_library( + name = "jni", + srcs = glob(["*.cpp"]), + headers = glob(["*.h"]), + header_namespace = "", + compiler_flags_enable_exceptions = True, # TODO: is this necessary? + compiler_flags_enable_rtti = True, # TODO: is this necessary? + fbandroid_allow_jni_merging = True, + platforms = ANDROID, + soname = "libjscexecutor.$(ext)", + visibility = [ + react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"), + ], + deps = [ + FBJNI_TARGET, + react_native_target("jni/react/jni:jni"), + react_native_xplat_target("jsi:JSCRuntime"), + react_native_xplat_target("jsiexecutor:jsiexecutor"), + ], +) diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt rename to ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp rename to ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp