From fc584bf7c1dd2f2b3305353577c4fe5b015f45c7 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Mon, 6 Apr 2015 13:22:27 -0700 Subject: [PATCH] Use assetManager reference in legacy that exists in hybrid mode as well --- legacy/project/src/android/AndroidFrame.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/legacy/project/src/android/AndroidFrame.cpp b/legacy/project/src/android/AndroidFrame.cpp index 7ad119c27..b11e53842 100644 --- a/legacy/project/src/android/AndroidFrame.cpp +++ b/legacy/project/src/android/AndroidFrame.cpp @@ -598,16 +598,13 @@ AAsset *AndroidGetAsset(const char *inResource) if (!androidAssetManager) { JNIEnv *env = GetEnv(); - #ifdef HX_LIME - jclass cls = FindClass("org/haxe/lime/GameActivity"); - #else - jclass cls = FindClass("org/haxe/nme/GameActivity"); - #endif - jmethodID mid = env->GetStaticMethodID(cls, "getAssetManager", "()Landroid/content/res/AssetManager;"); - if (mid == 0) + jclass cls = FindClass("org/haxe/extension/Extension"); + + jfieldID fid = env->GetStaticFieldID(cls, "assetManager", "Landroid/content/res/AssetManager;"); + if (fid == 0) return 0; - jobject assetManager = (jobject)env->CallStaticObjectMethod(cls, mid); + jobject assetManager = (jobject)env->GetStaticObjectField(cls, fid); if (assetManager==0) { //LOG("Could not find assetManager for asset %s", inResource);