mirror of https://github.com/encounter/SDL.git
Backed out changeset a43cb4e54949
Trying this a different way.
This commit is contained in:
parent
913aa610b5
commit
efd665e2c7
|
@ -2284,11 +2284,6 @@ void *SDL_AndroidGetActivity(void)
|
||||||
return (*env)->CallStaticObjectMethod(env, mActivityClass, midGetContext);
|
return (*env)->CallStaticObjectMethod(env, mActivityClass, midGetContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
jclass Android_GetActivityClass(void)
|
|
||||||
{
|
|
||||||
return mActivityClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
int SDL_GetAndroidSDKVersion(void)
|
int SDL_GetAndroidSDKVersion(void)
|
||||||
{
|
{
|
||||||
static int sdk_version;
|
static int sdk_version;
|
||||||
|
|
|
@ -140,8 +140,6 @@ void Android_ActivityMutex_Lock(void);
|
||||||
void Android_ActivityMutex_Unlock(void);
|
void Android_ActivityMutex_Unlock(void);
|
||||||
void Android_ActivityMutex_Lock_Running(void);
|
void Android_ActivityMutex_Lock_Running(void);
|
||||||
|
|
||||||
jclass Android_GetActivityClass(void);
|
|
||||||
|
|
||||||
/* Ends C function definitions when using C++ */
|
/* Ends C function definitions when using C++ */
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
/* *INDENT-OFF* */
|
/* *INDENT-OFF* */
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
misrepresented as being the original software.
|
misrepresented as being the original software.
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../SDL_internal.h"
|
#include "../SDL_internal.h"
|
||||||
#include "SDL_misc.h"
|
#include "SDL_misc.h"
|
||||||
#include "SDL_error.h"
|
#include "SDL_error.h"
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
int
|
int
|
||||||
SDL_SYS_OpenURL(const char *url)
|
SDL_SYS_OpenURL(const char *url)
|
||||||
{
|
{
|
||||||
jclass mActivityClass = Android_GetActivityClass();
|
|
||||||
JNIEnv *env = Android_JNI_GetEnv();
|
JNIEnv *env = Android_JNI_GetEnv();
|
||||||
jstring jurl = (*env)->NewStringUTF(env, url);
|
jstring jurl = (*env)->NewStringUTF(env, url);
|
||||||
const int ret = (*env)->CallStaticIntMethod(env, mActivityClass, midOpenURL, jurl);
|
const int ret = (*env)->CallStaticIntMethod(env, mActivityClass, midOpenURL, jurl);
|
||||||
|
|
Loading…
Reference in New Issue