diff --git a/android/.classpath b/android/.classpath
new file mode 100644
index 0000000000..a4763d1eec
--- /dev/null
+++ b/android/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000000..4af1961cac
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,33 @@
+
+
+ RetroArch
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/android/.settings/org.eclipse.jdt.core.prefs b/android/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f77b31c2d2
--- /dev/null
+++ b/android/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100644
index 0000000000..b8c7093233
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/bin/classes/com/retroarch/BuildConfig.class b/android/bin/classes/com/retroarch/BuildConfig.class
new file mode 100644
index 0000000000..2ecbee69f1
Binary files /dev/null and b/android/bin/classes/com/retroarch/BuildConfig.class differ
diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class
new file mode 100644
index 0000000000..45b23bfee9
Binary files /dev/null and b/android/bin/classes/com/retroarch/MainActivity.class differ
diff --git a/android/bin/classes/com/retroarch/R$attr.class b/android/bin/classes/com/retroarch/R$attr.class
new file mode 100644
index 0000000000..f85362c78b
Binary files /dev/null and b/android/bin/classes/com/retroarch/R$attr.class differ
diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class
new file mode 100644
index 0000000000..6b99c19c15
Binary files /dev/null and b/android/bin/classes/com/retroarch/R$drawable.class differ
diff --git a/android/bin/classes/com/retroarch/R$layout.class b/android/bin/classes/com/retroarch/R$layout.class
new file mode 100644
index 0000000000..fae0fa84b3
Binary files /dev/null and b/android/bin/classes/com/retroarch/R$layout.class differ
diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class
new file mode 100644
index 0000000000..2b74c5aebc
Binary files /dev/null and b/android/bin/classes/com/retroarch/R$string.class differ
diff --git a/android/bin/classes/com/retroarch/R.class b/android/bin/classes/com/retroarch/R.class
new file mode 100644
index 0000000000..83ec258ebb
Binary files /dev/null and b/android/bin/classes/com/retroarch/R.class differ
diff --git a/android/bin/jarlist.cache b/android/bin/jarlist.cache
new file mode 100644
index 0000000000..1b5ec3f9c5
--- /dev/null
+++ b/android/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependecy. DO NOT EDIT.
+# format is
+# Encoding is UTF-8
diff --git a/android/gen/com/retroarch/BuildConfig.java b/android/gen/com/retroarch/BuildConfig.java
new file mode 100644
index 0000000000..f7b068bd97
--- /dev/null
+++ b/android/gen/com/retroarch/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.retroarch;
+
+public final class BuildConfig {
+ public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/android/gen/com/retroarch/R.java b/android/gen/com/retroarch/R.java
new file mode 100644
index 0000000000..2b02953f09
--- /dev/null
+++ b/android/gen/com/retroarch/R.java
@@ -0,0 +1,23 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package com.retroarch;
+
+public final class R {
+ public static final class attr {
+ }
+ public static final class drawable {
+ public static final int ic_launcher=0x7f020000;
+ }
+ public static final class layout {
+ public static final int main=0x7f030000;
+ }
+ public static final class string {
+ public static final int app_name=0x7f040001;
+ public static final int hello=0x7f040000;
+ }
+}
diff --git a/android/proguard-project.txt b/android/proguard-project.txt
new file mode 100644
index 0000000000..f2fe1559a2
--- /dev/null
+++ b/android/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/android/project.properties b/android/project.properties
new file mode 100644
index 0000000000..0840b4a059
--- /dev/null
+++ b/android/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-15
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..96a442e5b8
Binary files /dev/null and b/android/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/res/drawable-ldpi/ic_launcher.png b/android/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000..99238729d8
Binary files /dev/null and b/android/res/drawable-ldpi/ic_launcher.png differ
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..359047dfa4
Binary files /dev/null and b/android/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..71c6d760f0
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
new file mode 100644
index 0000000000..bc12cd8231
--- /dev/null
+++ b/android/res/layout/main.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
new file mode 100644
index 0000000000..1e2ffa990e
--- /dev/null
+++ b/android/res/values/strings.xml
@@ -0,0 +1,7 @@
+
+
+
+ Hello World, MainActivity!
+ RetroArch
+
+
\ No newline at end of file
diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/MainActivity.java
new file mode 100644
index 0000000000..c9364e2ea9
--- /dev/null
+++ b/android/src/com/retroarch/MainActivity.java
@@ -0,0 +1,13 @@
+package com.retroarch;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class MainActivity extends Activity {
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+ }
+}
\ No newline at end of file
diff --git a/ps3/main.c b/ps3/main.c
index 1ae53780b1..dc7b0b0c17 100644
--- a/ps3/main.c
+++ b/ps3/main.c
@@ -78,7 +78,7 @@ char MULTIMAN_EXECUTABLE[PATH_MAX];
int rarch_main(int argc, char *argv[]);
-SYS_PROCESS_PARAM(1001, 0x100000)
+SYS_PROCESS_PARAM(1001, 0x200000)
#undef main