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 CollectionToArray( JNIEnv* env, const JavaRef& collection) { - return JNI_Collection::Java_Collection_toArray(env, collection); + return nullptr; } ScopedJavaLocalRef ArrayToList(JNIEnv* env, const JavaRef& array) { - return JNI_Arrays::Java_Arrays_asList(env, array); + return nullptr; } ScopedJavaLocalRef MapToArray(JNIEnv* env, const JavaRef& map) { - return Java_JniUtil_mapToArray(env, map); + return nullptr; } ScopedJavaLocalRef ArrayToMap(JNIEnv* env, const JavaRef& 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 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); }