mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Do not store .cpp/.h files inside src/main/java - jscexecutor (#34396)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/34396 Current we expose native code (.h, .cpp) inside the src/main/java folder. This is making impossible for users on New Architecture to open the project inside Android Studio. The problem is that the src/main/java is reserved to Java/Kotlin sources only. AGP 7.2 also removed support for mixed source roots: https://developer.android.com/studio/releases/gradle-plugin#duplicate-content-roots This is essentially forcing users to write Java code without any autocompletion as all the React Native Java classes are considered C++ files. I'm addressing this issue folder by folder by moving them from ReactAndroid/src/main/java/com/facebook/... to ReactAndroid/src/main/jni/react/... This is the diff for jscexecutor Changelog: [Internal] [Changed] - Do not store .cpp/.h files inside src/main/java - jscexecutor Reviewed By: sshic Differential Revision: D38615007 fbshipit-source-id: e5085130579f37f052b5c8a5702d2c0f1b332bee
This commit is contained in:
committed by
Facebook GitHub Bot
parent
1246300e93
commit
be391844f7
@@ -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"),
|
||||
],
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"),
|
||||
],
|
||||
)
|
||||
Reference in New Issue
Block a user