From d1b9015aef0d6d462667d3f53efbdf67f28138ec Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Fri, 30 Nov 2012 20:54:29 -0500
Subject: [PATCH] [ANDROID] pass phone version to activity

---
 android/native/jni/android_general.h           | 1 +
 android/native/jni/main.c                      | 4 ++++
 android/phoenix/src/com/retroarch/phoenix.java | 1 +
 3 files changed, 6 insertions(+)

diff --git a/android/native/jni/android_general.h b/android/native/jni/android_general.h
index 41dbfed51e..3217936da4 100644
--- a/android/native/jni/android_general.h
+++ b/android/native/jni/android_general.h
@@ -34,6 +34,7 @@ struct droid
    unsigned width;
    unsigned height;
    struct saved_state state;
+   int version;
 };
 
 extern struct droid g_android;
diff --git a/android/native/jni/main.c b/android/native/jni/main.c
index 7fccd06cb2..a174aeff07 100644
--- a/android/native/jni/main.c
+++ b/android/native/jni/main.c
@@ -283,11 +283,15 @@ static void* android_app_entry(void* param)
 
    char rom_path[512];
    char libretro_path[512];
+   char android_version[16];
 
    // Get arguments */
    android_get_char_argv(rom_path, sizeof(rom_path), "ROM");
    android_get_char_argv(libretro_path, sizeof(libretro_path), "LIBRETRO");
+   android_get_char_argv(android_version, sizeof(android_version), "ANDROIDVER");
+   g_android.version = atoi(android_version);
 
+   RARCH_LOG("Android version: %d\n", g_android.version);
    RARCH_LOG("Checking arguments passed...\n");
    RARCH_LOG("ROM Filename: [%s].\n", rom_path);
    RARCH_LOG("Libretro path: [%s].\n", libretro_path);
diff --git a/android/phoenix/src/com/retroarch/phoenix.java b/android/phoenix/src/com/retroarch/phoenix.java
index 762fc421e1..6659d936d6 100644
--- a/android/phoenix/src/com/retroarch/phoenix.java
+++ b/android/phoenix/src/com/retroarch/phoenix.java
@@ -91,6 +91,7 @@ public class phoenix extends Activity
     				   myIntent = new Intent(this, NativeActivity.class);
     				   myIntent.putExtra("ROM", data.getStringExtra("PATH"));
     				   myIntent.putExtra("LIBRETRO", libretro_path);
+    				   myIntent.putExtra("ANDROIDVER", Integer.toString(android.os.Build.VERSION.SDK_INT));
     				   startActivity(myIntent);
     			   }
     			   else