Skip to content

Commit 38b5250

Browse files
cortinicororyabraham
authored andcommitted
Do not store .cpp/.h files inside src/main/java - fabricjni (facebook#34435)
Summary: Pull Request resolved: facebook#34435 Currently 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 fabricjni Changelog: [Internal] [Changed] - Do not store .cpp/.h files inside src/main/java - fabricjni Reviewed By: cipolleschi Differential Revision: D38741130 fbshipit-source-id: f9e3e4514d3ae0ddeac65256928d71d5134d08f8
1 parent 6f0c1c0 commit 38b5250

34 files changed

+4
-4
lines changed

ReactAndroid/cmake-utils/Android-prebuilt.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ set_target_properties(fabricjni
193193
PROPERTIES
194194
IMPORTED_LOCATION
195195
${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfabricjni.so)
196-
target_include_directories(fabricjni INTERFACE ${REACT_ANDROID_SRC_DIR}/java/com/facebook/react/fabric/jni)
196+
target_include_directories(fabricjni INTERFACE ${REACT_ANDROID_SRC_DIR}/jni/react/fabric)
197197

198198
## react_render_componentregistry
199199
add_library(react_render_componentregistry SHARED IMPORTED GLOBAL)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ rn_android_library(
4242
react_native_target("java/com/facebook/debug/holder:holder"),
4343
react_native_target("java/com/facebook/react/bridge:bridge"),
4444
react_native_target("java/com/facebook/react/config:config"),
45-
react_native_target("java/com/facebook/react/fabric/jni:jni"),
4645
react_native_target("java/com/facebook/react/module/annotations:annotations"),
4746
react_native_target("java/com/facebook/react/modules/core:core"),
4847
react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
@@ -52,5 +51,6 @@ rn_android_library(
5251
react_native_target("java/com/facebook/react/views/view:view"),
5352
react_native_target("java/com/facebook/react/views/text:text"),
5453
react_native_target("java/com/facebook/react/touch:touch"),
54+
react_native_target("jni/react/fabric:jni"),
5555
] + KOTLIN_STDLIB_DEPS,
5656
)

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public <T extends View> int addRootView(
294294
* @return a {@link ReadableMap} that contains metadata associated to the React Component that
295295
* rendered the Android View received as a parameter. For more details about the keys stored
296296
* in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
297-
* com/facebook/react/fabric/jni/Binding.cpp file.
297+
* jni/react/fabric/Binding.cpp file.
298298
*/
299299
@UiThread
300300
@ThreadConfined(UI)

ReactAndroid/src/main/jni/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni)
100100
add_react_android_subdir(src/main/jni/react/uimanager)
101101
add_react_android_subdir(src/main/jni/react/mapbuffer)
102102
add_react_android_subdir(src/main/jni/react/reactnativeblob)
103-
add_react_android_subdir(src/main/java/com/facebook/react/fabric/jni)
103+
add_react_android_subdir(src/main/jni/react/fabric)
104104
add_react_android_subdir(src/main/jni/react/hermes/reactexecutor)
105105
add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
106106

0 commit comments

Comments
 (0)