From 5b4f286bb988046bfb4048df6c0bdd080a583224 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 27 Jul 2024 10:18:11 +0800 Subject: [PATCH] android: third_party/jni_zero: Remove JNI functions --- src/third_party/jni_zero/BUILD.gn | 24 ------------------------ src/third_party/jni_zero/jni_zero.cc | 8 -------- 2 files changed, 32 deletions(-) diff --git a/src/third_party/jni_zero/BUILD.gn b/src/third_party/jni_zero/BUILD.gn index 0812b5b861..b99888b239 100644 --- a/src/third_party/jni_zero/BUILD.gn +++ b/src/third_party/jni_zero/BUILD.gn @@ -18,27 +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", - "java/util/List.class", - "java/util/Map.class", - ] - visibility = [ ":*" ] -} - # This is the public target that we intend others to use. component("jni_zero") { public = [ @@ -52,7 +31,6 @@ component("jni_zero") { ] sources = [ - "common_apis.cc", "common_apis.h", "default_conversions.cc", "java_refs.cc", @@ -75,8 +53,6 @@ component("jni_zero") { } deps = [ - ":generate_jni($default_toolchain)", - ":system_jni($default_toolchain)", ] } diff --git a/src/third_party/jni_zero/jni_zero.cc b/src/third_party/jni_zero/jni_zero.cc index a90eeafe3d..0b433208d6 100644 --- a/src/third_party/jni_zero/jni_zero.cc +++ b/src/third_party/jni_zero/jni_zero.cc @@ -6,7 +6,6 @@ #include -#include "third_party/jni_zero/generate_jni/JniInit_jni.h" #include "third_party/jni_zero/jni_methods.h" #include "third_party/jni_zero/jni_zero_internal.h" #include "third_party/jni_zero/logging.h" @@ -123,13 +122,6 @@ void InitVM(JavaVM* vm) { JNIEnv* env = AttachCurrentThread(); g_object_class = GetSystemClassGlobalRef(env, "java/lang/Object"); 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); }