diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK index daa264d3ba5..cf73290ace2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK @@ -22,7 +22,7 @@ rn_android_library( deps = [ FBJNI_TARGET, react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), - react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"), + react_native_target("jni/react/mapbuffer:jni"), react_native_dep("libraries/fbjni:java"), react_native_dep("third-party/android/androidx:annotation"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt index e1bef54ad15..744a9ee15a5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt @@ -17,7 +17,7 @@ import javax.annotation.concurrent.NotThreadSafe /** * Read-only implementation of the [MapBuffer], imported from C++ environment. Use - * ` to create it. + * ` to create it. * * See [MapBuffer] documentation for more details */ diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt index d5f08b71da0..d23049148de 100644 --- a/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/CMakeLists.txt @@ -98,7 +98,7 @@ add_react_android_subdir(src/main/jni/react/reactperflogger) 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) +add_react_android_subdir(src/main/jni/react/mapbuffer) add_react_android_subdir(src/main/java/com/facebook/react/fabric/jni) add_react_android_subdir(src/main/java/com/facebook/react/modules/blob/jni) add_react_android_subdir(src/main/jni/react/hermes/reactexecutor) diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK b/ReactAndroid/src/main/jni/react/mapbuffer/BUCK similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK rename to ReactAndroid/src/main/jni/react/mapbuffer/BUCK diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt rename to ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/.clang-tidy b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/.clang-tidy similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/.clang-tidy rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/.clang-tidy diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.cpp rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.h b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.h rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.cpp rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.h b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.h rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp diff --git a/ReactCommon/react/utils/BUCK b/ReactCommon/react/utils/BUCK index 85b786d15c2..bc2b70d745d 100644 --- a/ReactCommon/react/utils/BUCK +++ b/ReactCommon/react/utils/BUCK @@ -36,7 +36,7 @@ rn_xplat_cxx_library( ), compiler_flags_pedantic = True, fbandroid_deps = [ - react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"), + react_native_target("jni/react/mapbuffer:jni"), react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"), ], fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,