From a87831442d871e246870f92f8bd1c0150095db38 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Sat, 27 Jul 2024 10:18:11 +0800
Subject: [PATCH] third_party/jni_zero: Remove JNI functions

---
 src/third_party/jni_zero/BUILD.gn       | 21 ---------------------
 src/third_party/jni_zero/common_apis.cc | 12 ++++--------
 src/third_party/jni_zero/jni_zero.cc    |  8 --------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/third_party/jni_zero/BUILD.gn b/src/third_party/jni_zero/BUILD.gn
index e99efa056a..dcacd2a8b9 100644
--- a/src/third_party/jni_zero/BUILD.gn
+++ b/src/third_party/jni_zero/BUILD.gn
@@ -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.
 component("jni_zero") {
   public = [
@@ -73,8 +54,6 @@ component("jni_zero") {
   }
 
   deps = [
-    ":generate_jni($default_toolchain)",
-    ":system_jni($default_toolchain)",
   ]
 }
 
diff --git a/src/third_party/jni_zero/common_apis.cc b/src/third_party/jni_zero/common_apis.cc
index f6d99d95c0..3ee4fe9a1a 100644
--- a/src/third_party/jni_zero/common_apis.cc
+++ b/src/third_party/jni_zero/common_apis.cc
@@ -4,30 +4,26 @@
 
 #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 {
 
 ScopedJavaLocalRef<jobjectArray> CollectionToArray(
     JNIEnv* env,
     const JavaRef<jobject>& collection) {
-  return JNI_Collection::Java_Collection_toArray(env, collection);
+  return nullptr;
 }
 
 ScopedJavaLocalRef<jobject> ArrayToList(JNIEnv* env,
                                         const JavaRef<jobjectArray>& array) {
-  return JNI_Arrays::Java_Arrays_asList(env, array);
+  return nullptr;
 }
 
 ScopedJavaLocalRef<jobjectArray> MapToArray(JNIEnv* env,
                                             const JavaRef<jobject>& map) {
-  return Java_JniUtil_mapToArray(env, map);
+  return nullptr;
 }
 ScopedJavaLocalRef<jobject> ArrayToMap(JNIEnv* env,
                                        const JavaRef<jobjectArray>& array) {
-  return Java_JniUtil_arrayToMap(env, array);
+  return nullptr;
 }
 
 }  // namespace jni_zero
diff --git a/src/third_party/jni_zero/jni_zero.cc b/src/third_party/jni_zero/jni_zero.cc
index 96bfc4423e..90876bc652 100644
--- a/src/third_party/jni_zero/jni_zero.cc
+++ b/src/third_party/jni_zero/jni_zero.cc
@@ -6,7 +6,6 @@
 
 #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_zero_internal.h"
 #include "third_party/jni_zero/logging.h"
@@ -124,13 +123,6 @@ void InitVM(JavaVM* vm) {
   g_string_class = GetSystemClassGlobalRef(env, "java/lang/String");
   g_empty_string.Reset(
       env, ScopedJavaLocalRef<jstring>(env, env->NewString(nullptr, 0)));
-  ScopedJavaLocalRef<jobjectArray> globals = Java_JniInit_init(env);
-  g_empty_list.Reset(env,
-                     ScopedJavaLocalRef<jobject>(
-                         env, env->GetObjectArrayElement(globals.obj(), 0)));
-  g_empty_map.Reset(env,
-                    ScopedJavaLocalRef<jobject>(
-                        env, env->GetObjectArrayElement(globals.obj(), 1)));
 }
 
 void DisableJvmForTesting() {