From 3f279a2d5c74440a208486f4531fefa5c84b9042 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 20 Nov 2013 15:54:31 +0100
Subject: [PATCH] (Android) Get rid of JNI_OnLoad - unused and unneeded

---
 .../src/com/retroarch/browser/RetroActivity.java       |  7 -------
 frontend/platform/platform_android.c                   | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivity.java b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
index ca3b394964..ae1fc1f9c7 100644
--- a/android/phoenix/src/com/retroarch/browser/RetroActivity.java
+++ b/android/phoenix/src/com/retroarch/browser/RetroActivity.java
@@ -17,13 +17,6 @@ public final class RetroActivity extends NativeActivity
 	private long lastTimestamp = 0;
 	private SurfaceTexture texture;
 
-	// Static constructor
-	static
-	{
-		Log.i("RetroActivity", "Creating RetroActivity");
-		System.loadLibrary("retroarch-activity");  
-	}
-
 	public void onCameraStart()
 	{
 		Log.i("RetroActivity", "onCameraStart");
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 73fecb64d9..30cc42d88c 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -375,16 +375,6 @@ static void system_shutdown(bool unused)
    exit(0);
 }
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-   RARCH_LOG("JNI_OnLoad.\n");
-   JNIEnv* env;
-   if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK)
-      return -1;
-
-   return JNI_VERSION_1_6;
-}
-
 const frontend_ctx_driver_t frontend_ctx_android = {
    get_environment_settings,     /* get_environment_settings */
    system_init,                  /* init */