Merge branch 'main' into expanded-state

facebook · Aug 16, 2022 · e5b6b07 · e5b6b07
2 parents 14509d9 + d35aab4
commit e5b6b07
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 9 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@@ -31,7 +31,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/modules/blob/jni:jni"),
+        react_native_target("jni/react/reactnativeblob:jni"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/websocket:websocket"),
     ],

diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt
@@ -99,7 +99,8 @@ 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/jni/react/mapbuffer)
+add_react_android_subdir(src/main/jni/react/reactnativeblob)
 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)
 add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
+
diff --git a/.../com/facebook/react/modules/blob/jni/BUCK → ...d/src/main/jni/react/reactnativeblob/BUCK b/.../com/facebook/react/modules/blob/jni/BUCK → ...d/src/main/jni/react/reactnativeblob/BUCK
diff --git a/.../react/modules/blob/jni/BlobCollector.cpp → ...i/react/reactnativeblob/BlobCollector.cpp b/.../react/modules/blob/jni/BlobCollector.cpp → ...i/react/reactnativeblob/BlobCollector.cpp
diff --git a/...ok/react/modules/blob/jni/BlobCollector.h → ...jni/react/reactnativeblob/BlobCollector.h b/...ok/react/modules/blob/jni/BlobCollector.h → ...jni/react/reactnativeblob/BlobCollector.h
diff --git a/...ook/react/modules/blob/jni/CMakeLists.txt → .../jni/react/reactnativeblob/CMakeLists.txt b/...ook/react/modules/blob/jni/CMakeLists.txt → .../jni/react/reactnativeblob/CMakeLists.txt
diff --git a/...acebook/react/modules/blob/jni/OnLoad.cpp → ...main/jni/react/reactnativeblob/OnLoad.cpp b/...acebook/react/modules/blob/jni/OnLoad.cpp → ...main/jni/react/reactnativeblob/OnLoad.cpp
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
@@ -197,14 +197,7 @@ android {
     }
 }
 
-configurations {
-  hermesDebugImplementation {}
-  hermesReleaseImplementation {}
-}
-
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     // Build React Native from source
     implementation project(':ReactAndroid')