Move the libcore registration out of libnativehelpers and into libcore.

Bug: 754114
Change-Id: Iaa03def509c10cbaa12fd2128584b93d4be4a6b7

4 files changed, 8 insertions, 34 deletions

diff --git a/archive/src/main/native/java_util_zip_Adler32.c b/archive/src/main/native/java_util_zip_Adler32.c
index 0fcf549..4410e5b 100644
--- a/archive/src/main/native/java_util_zip_Adler32.c
+++ b/archive/src/main/native/java_util_zip_Adler32.c
@@ -43,17 +43,10 @@ Java_java_util_zip_Adler32_updateByteImpl (JNIEnv * env, jobject recv,
   return adler32 ((uLong) crc, (Bytef *) (&bytefVal), 1);
 }
 
-
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "updateImpl", "([BIIJ)J",     Java_java_util_zip_Adler32_updateImpl },
     { "updateByteImpl", "(IJ)J",     Java_java_util_zip_Adler32_updateByteImpl },
 };
-int register_java_util_zip_Adler32(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/util/zip/Adler32",
-                gMethods, NELEM(gMethods));
+int register_java_util_zip_Adler32(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/util/zip/Adler32", gMethods, NELEM(gMethods));
 }
diff --git a/archive/src/main/native/java_util_zip_CRC32.c b/archive/src/main/native/java_util_zip_CRC32.c
index fe50fca..95369a2 100644
--- a/archive/src/main/native/java_util_zip_CRC32.c
+++ b/archive/src/main/native/java_util_zip_CRC32.c
@@ -41,17 +41,10 @@ Java_java_util_zip_CRC32_updateByteImpl (JNIEnv * env, jobject recv,
   return crc32 ((uLong) crc, (Bytef *) (&val), 1);
 }
 
-
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "updateImpl", "([BIIJ)J",     Java_java_util_zip_CRC32_updateImpl },
     { "updateByteImpl", "(BJ)J",     Java_java_util_zip_CRC32_updateByteImpl },
 };
-int register_java_util_zip_CRC32(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/util/zip/CRC32",
-                gMethods, NELEM(gMethods));
+int register_java_util_zip_CRC32(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/util/zip/CRC32", gMethods, NELEM(gMethods));
 }
diff --git a/archive/src/main/native/java_util_zip_Deflater.c b/archive/src/main/native/java_util_zip_Deflater.c
index af0bfcc..59c7433 100644
--- a/archive/src/main/native/java_util_zip_Deflater.c
+++ b/archive/src/main/native/java_util_zip_Deflater.c
@@ -286,11 +286,7 @@ Java_java_util_zip_Deflater_oneTimeInitialization (JNIEnv * env, jclass clazz)
     gCachedFields.finished = (*env)->GetFieldID (env, clazz, "finished", "Z");
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "setDictionaryImpl", "([BIIJ)V",     Java_java_util_zip_Deflater_setDictionaryImpl },
     { "getTotalInImpl", "(J)J",     Java_java_util_zip_Deflater_getTotalInImpl },
     { "getTotalOutImpl", "(J)J",     Java_java_util_zip_Deflater_getTotalOutImpl },
@@ -303,8 +299,6 @@ static JNINativeMethod gMethods[] = {
     { "setLevelsImpl", "(IIJ)V",     Java_java_util_zip_Deflater_setLevelsImpl },
     { "oneTimeInitialization", "()V",     Java_java_util_zip_Deflater_oneTimeInitialization },
 };
-int register_java_util_zip_Deflater(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/util/zip/Deflater",
-                gMethods, NELEM(gMethods));
+int register_java_util_zip_Deflater(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/util/zip/Deflater", gMethods, NELEM(gMethods));
 }
diff --git a/archive/src/main/native/java_util_zip_Inflater.c b/archive/src/main/native/java_util_zip_Inflater.c
index ba89ce8..6281081 100644
--- a/archive/src/main/native/java_util_zip_Inflater.c
+++ b/archive/src/main/native/java_util_zip_Inflater.c
@@ -322,11 +322,7 @@ Java_java_util_zip_Inflater_oneTimeInitialization (JNIEnv * env, jclass clazz)
     gCachedFields.needsDictionary = (*env)->GetFieldID (env, clazz, "needsDictionary", "Z");
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "createStream", "(Z)J",     Java_java_util_zip_Inflater_createStream },
     { "setInputImpl", "([BIIJ)V",     Java_java_util_zip_Inflater_setInputImpl },
     { "setFileInputImpl", "(Ljava/io/FileDescriptor;JIJ)I",     Java_java_util_zip_Inflater_setFileInputImpl },
@@ -339,8 +335,6 @@ static JNINativeMethod gMethods[] = {
     { "getTotalInImpl", "(J)J",     Java_java_util_zip_Inflater_getTotalInImpl },
     { "oneTimeInitialization", "()V",     Java_java_util_zip_Inflater_oneTimeInitialization },
 };
-int register_java_util_zip_Inflater(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/util/zip/Inflater",
-                gMethods, NELEM(gMethods));
+int register_java_util_zip_Inflater(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/util/zip/Inflater", gMethods, NELEM(gMethods));
 }