Code drop from //branches/cupcake/...@124589

3 files changed, 5 insertions, 23 deletions

diff --git a/libnativehelper/Register.c b/libnativehelper/Register.c
index 9e88c14e2..b77cc13f6 100644
--- a/libnativehelper/Register.c
+++ b/libnativehelper/Register.c
@@ -45,8 +45,6 @@ int jniRegisterSystemMethods(JNIEnv* env)
         goto bail;
     if (register_java_lang_System(env) != 0)
         goto bail;
-    //if (register_java_lang_reflect_Proxy(env) != 0)
-    //    goto bail;
 
     if (register_org_apache_harmony_luni_platform_OSFileSystem(env) != 0)
         goto bail;
@@ -89,9 +87,6 @@ int jniRegisterSystemMethods(JNIEnv* env)
     if (register_java_net_NetworkInterface(env) != 0)
         goto bail;
 
-    if (register_javax_crypto_HmacSpi(env) != 0)
-        goto bail;
-
     if (register_com_ibm_icu4jni_text_NativeBreakIterator(env) != 0)
         goto bail;
     if (register_com_ibm_icu4jni_text_NativeDecimalFormat(env) != 0)
diff --git a/libnativehelper/include/nativehelper/AndroidSystemNatives.h b/libnativehelper/include/nativehelper/AndroidSystemNatives.h
index d095b398f..46e2bf20e 100644
--- a/libnativehelper/include/nativehelper/AndroidSystemNatives.h
+++ b/libnativehelper/include/nativehelper/AndroidSystemNatives.h
@@ -55,7 +55,6 @@ int register_java_lang_Math(JNIEnv* env);
 int register_java_lang_ProcessManager(JNIEnv* env);
 int register_java_lang_StrictMath(JNIEnv* env);
 int register_java_lang_System(JNIEnv* env);
-int register_java_lang_reflect_Proxy(JNIEnv* env);
 
 int register_org_apache_harmony_luni_platform_OSFileSystem(JNIEnv* env);
 int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv* env);
@@ -81,8 +80,6 @@ int register_java_net_NetworkInterface(JNIEnv* env);
 int register_org_apache_harmony_luni_util_fltparse(JNIEnv *env);
 int register_org_apache_harmony_luni_util_NumberConvert(JNIEnv *env);
 
-int register_javax_crypto_HmacSpi(JNIEnv* env);
-
 int register_com_ibm_icu4jni_converters_NativeConverter(JNIEnv* env);
 int register_com_ibm_icu4jni_lang_UCharacter(JNIEnv* env);
 int register_com_ibm_icu4jni_text_NativeCollator(JNIEnv* env);
diff --git a/libnativehelper/include/nativehelper/jni.h b/libnativehelper/include/nativehelper/jni.h
index 3ee25aef7..ad954c8f6 100644
--- a/libnativehelper/include/nativehelper/jni.h
+++ b/libnativehelper/include/nativehelper/jni.h
@@ -11,10 +11,6 @@
 
 #include <stdarg.h>
 
-#ifdef JNI_FORCE_C
-#warning "Use of JNI_FORCE_C is deprecated"
-#endif
-
 /*
  * Primitive types that match up with Java equivalents.
  */
@@ -138,7 +134,7 @@ struct _JNIEnv;
 struct _JavaVM;
 typedef const struct JNINativeInterface* C_JNIEnv;
 
-#if defined(__cplusplus) && !defined(JNI_FORCE_C)
+#if defined(__cplusplus)
 typedef _JNIEnv JNIEnv;
 typedef _JavaVM JavaVM;
 #else
@@ -494,7 +490,7 @@ struct _JNIEnv {
     /* do not rename this; it does not seem to be entirely opaque */
     const struct JNINativeInterface* functions;
 
-#if defined(__cplusplus) && !defined(JNI_FORCE_C)
+#if defined(__cplusplus)
 
     jint GetVersion()
     { return functions->GetVersion(this); }
@@ -1030,7 +1026,7 @@ struct _JNIEnv {
     /* added in JNI 1.6 */
     jobjectRefType GetObjectRefType(jobject obj)
     { return functions->GetObjectRefType(this, obj); }
-#endif /*__cplusplus && !JNI_FORCE_C*/
+#endif /*__cplusplus*/
 };
 
 
@@ -1055,7 +1051,7 @@ struct JNIInvokeInterface {
 struct _JavaVM {
     const struct JNIInvokeInterface* functions;
 
-#if defined(__cplusplus) && !defined(JNI_FORCE_C)
+#if defined(__cplusplus)
     jint DestroyJavaVM()
     { return functions->DestroyJavaVM(this); }
     jint AttachCurrentThread(JNIEnv** p_env, void* thr_args)
@@ -1066,7 +1062,7 @@ struct _JavaVM {
     { return functions->GetEnv(this, env, version); }
     jint AttachCurrentThreadAsDaemon(JNIEnv** p_env, void* thr_args)
     { return functions->AttachCurrentThreadAsDaemon(this, p_env, thr_args); }
-#endif /*__cplusplus && !JNI_FORCE_C*/
+#endif /*__cplusplus*/
 };
 
 struct JavaVMAttachArgs {
@@ -1105,12 +1101,6 @@ jint JNI_GetDefaultJavaVMInitArgs(void*);
 jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*);
 jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
 
-/* Dalvik entry points */
-jint JNI_GetDefaultJavaVMInitArgs(void*);
-jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*);
-jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
-
-
 /*
  * Prototypes for functions exported by loadable shared libs.  These are
  * called by JNI, not provided by JNI.