Change types of JniEntryPoints members to void*.
Similar to aosp/1973218, make these entry points uncallable
from C++.
Change-Id: Ia4436f47e121752fc70c402d73beec122966f16a
diff --git a/runtime/entrypoints/jni/jni_entrypoints.h b/runtime/entrypoints/jni/jni_entrypoints.h
index 0aabed0..def9ddb 100644
--- a/runtime/entrypoints/jni/jni_entrypoints.h
+++ b/runtime/entrypoints/jni/jni_entrypoints.h
@@ -28,11 +28,11 @@
namespace art {
// Pointers to functions that are called by JNI trampolines via thread-local storage.
-struct PACKED(4) JniEntryPoints {
+struct JniEntryPoints {
// Called when the JNI method isn't registered for normal native and @FastNative methods.
- void* (*pDlsymLookup)(JNIEnv* env, jobject);
+ void* pDlsymLookup;
// Called when the JNI method isn't registered for @CriticalNative methods.
- void* (*pDlsymLookupCritical)(JNIEnv* env, jobject);
+ void* pDlsymLookupCritical;
};
} // namespace art
diff --git a/runtime/entrypoints/quick/quick_default_init_entrypoints.h b/runtime/entrypoints/quick/quick_default_init_entrypoints.h
index d1ce38b..939feee 100644
--- a/runtime/entrypoints/quick/quick_default_init_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_default_init_entrypoints.h
@@ -30,8 +30,8 @@
QuickEntryPoints* qpoints,
bool monitor_jni_entry_exit) {
// JNI
- jpoints->pDlsymLookup = art_jni_dlsym_lookup_stub;
- jpoints->pDlsymLookupCritical = art_jni_dlsym_lookup_critical_stub;
+ jpoints->pDlsymLookup = reinterpret_cast<void*>(art_jni_dlsym_lookup_stub);
+ jpoints->pDlsymLookupCritical = reinterpret_cast<void*>(art_jni_dlsym_lookup_critical_stub);
// Alloc
ResetQuickAllocEntryPoints(qpoints);