Merge "Cast ApkAssets to uintptr_t before jlong" into sc-dev

2021-02-10 20:31:06 +00:00
parent d0d61680b2 1d46f4f2dd
commit dc7eaa0bd8
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_content_res_ApkAssets.cpp
+++ b/core/jni/android_content_res_ApkAssets.cpp
@@ -354,7 +354,7 @@ static void NativeDestroy(void* ptr) {
 }

 static jlong NativeGetFinalizer(JNIEnv* /*env*/, jclass /*clazz*/) {
-  return reinterpret_cast<jlong>(&NativeDestroy);
+  return static_cast<jlong>(reinterpret_cast<uintptr_t>(&NativeDestroy));
 }

 static jstring NativeGetAssetPath(JNIEnv* env, jclass /*clazz*/, jlong ptr) {