Skip to content

Commit 296d7db

Browse files
cortinicofacebook-github-bot
authored andcommitted
Do not store .cpp/.h files inside src/main/java - reactperflogger (#34386)
Summary: Pull Request resolved: #34386 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 reactperflogger Changelog: [Internal] [Changed] - Do not store .cpp/.h files inside src/main/java - reactperflogger Reviewed By: cipolleschi Differential Revision: D38584681 fbshipit-source-id: 8b65b3fa47a7f106c7fea79fd739f0e4e37efa2a
1 parent 7783f88 commit 296d7db

File tree

8 files changed

+4
-3
lines changed

8 files changed

+4
-3
lines changed

ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ rn_android_library(
2020
deps = [
2121
react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
2222
react_native_dep("libraries/fbjni:java"),
23-
react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
23+
react_native_target("jni/react/reactperflogger:jni"),
2424
],
2525
)

ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ rn_xplat_cxx_library(
3636
react_native_xplat_shared_library_target("jsi:jsi"),
3737
react_native_xplat_target("react/nativemodule/core:core"),
3838
react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
39-
react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
39+
react_native_target("jni/react/reactperflogger:jni"),
4040
],
4141
)
4242

ReactAndroid/src/main/jni/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ add_react_android_subdir(src/main/jni/first-party/fb)
9595
add_react_android_subdir(src/main/jni/first-party/fbgloginit)
9696
add_react_android_subdir(src/main/jni/first-party/yogajni)
9797
add_react_android_subdir(src/main/jni/react/jni)
98-
add_react_android_subdir(src/main/java/com/facebook/react/reactperflogger/jni)
98+
add_react_android_subdir(src/main/jni/react/reactperflogger)
9999
add_react_android_subdir(src/main/java/com/facebook/react/jscexecutor)
100100
add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni)
101101
add_react_android_subdir(src/main/java/com/facebook/react/uimanager/jni)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
InheritParentConfig: true
23
Checks: '>
34
clang-diagnostic-*,
45
'

0 commit comments

Comments
 (0)