android: third_party/jni_zero: Remove JNI functions

This commit is contained in:
klzgrad 2024-07-27 10:18:11 +08:00
parent 764cebb6eb
commit f88b330a79
3 changed files with 4 additions and 37 deletions

View File

@ -18,25 +18,6 @@ config("jni_zero_defines") {
} }
} }
generate_jni("generate_jni") {
sources = [
"java/src/org/jni_zero/JniInit.java",
"java/src/org/jni_zero/JniUtil.java",
]
visibility = [
":*",
"//components/cronet/android/*",
]
}
generate_jar_jni("system_jni") {
classes = [
"java/util/Arrays.class",
"java/util/Collection.class",
]
visibility = [ ":*" ]
}
# This is the public target that we intend others to use. # This is the public target that we intend others to use.
component("jni_zero") { component("jni_zero") {
public = [ public = [
@ -73,8 +54,6 @@ component("jni_zero") {
} }
deps = [ deps = [
":generate_jni($default_toolchain)",
":system_jni($default_toolchain)",
] ]
} }

View File

@ -4,30 +4,26 @@
#include "third_party/jni_zero/common_apis.h" #include "third_party/jni_zero/common_apis.h"
#include "third_party/jni_zero/generate_jni/JniUtil_jni.h"
#include "third_party/jni_zero/system_jni/Arrays_jni.h"
#include "third_party/jni_zero/system_jni/Collection_jni.h"
namespace jni_zero { namespace jni_zero {
ScopedJavaLocalRef<jobjectArray> CollectionToArray( ScopedJavaLocalRef<jobjectArray> CollectionToArray(
JNIEnv* env, JNIEnv* env,
const JavaRef<jobject>& collection) { const JavaRef<jobject>& collection) {
return JNI_Collection::Java_Collection_toArray(env, collection); return nullptr;
} }
ScopedJavaLocalRef<jobject> ArrayToList(JNIEnv* env, ScopedJavaLocalRef<jobject> ArrayToList(JNIEnv* env,
const JavaRef<jobjectArray>& array) { const JavaRef<jobjectArray>& array) {
return JNI_Arrays::Java_Arrays_asList(env, array); return nullptr;
} }
ScopedJavaLocalRef<jobjectArray> MapToArray(JNIEnv* env, ScopedJavaLocalRef<jobjectArray> MapToArray(JNIEnv* env,
const JavaRef<jobject>& map) { const JavaRef<jobject>& map) {
return Java_JniUtil_mapToArray(env, map); return nullptr;
} }
ScopedJavaLocalRef<jobject> ArrayToMap(JNIEnv* env, ScopedJavaLocalRef<jobject> ArrayToMap(JNIEnv* env,
const JavaRef<jobjectArray>& array) { const JavaRef<jobjectArray>& array) {
return Java_JniUtil_arrayToMap(env, array); return nullptr;
} }
} // namespace jni_zero } // namespace jni_zero

View File

@ -6,7 +6,6 @@
#include <sys/prctl.h> #include <sys/prctl.h>
#include "third_party/jni_zero/generate_jni/JniInit_jni.h"
#include "third_party/jni_zero/jni_methods.h" #include "third_party/jni_zero/jni_methods.h"
#include "third_party/jni_zero/jni_zero_internal.h" #include "third_party/jni_zero/jni_zero_internal.h"
#include "third_party/jni_zero/logging.h" #include "third_party/jni_zero/logging.h"
@ -123,13 +122,6 @@ void InitVM(JavaVM* vm) {
JNIEnv* env = AttachCurrentThread(); JNIEnv* env = AttachCurrentThread();
g_object_class = GetSystemClassGlobalRef(env, "java/lang/Object"); g_object_class = GetSystemClassGlobalRef(env, "java/lang/Object");
g_string_class = GetSystemClassGlobalRef(env, "java/lang/String"); g_string_class = GetSystemClassGlobalRef(env, "java/lang/String");
#if defined(JNI_ZERO_MULTIPLEXING_ENABLED)
Java_JniInit_crashIfMultiplexingMisaligned(env, kJniZeroHashWhole,
kJniZeroHashPriority);
#else
// Mark as used when multiplexing not enabled.
(void)&Java_JniInit_crashIfMultiplexingMisaligned;
#endif
CheckException(env); CheckException(env);
} }