Ticket #2996: 0002-A-small-step-for-wildfiregames-one-giant-leap-for-An.4.patch

.gitignore

@@ -26 +26 @@
 build/premake/.gccmachine.tmp
 build/premake/.gccver.tmp
 
+# Exclude android generated files
+build/android/qtcreator/android/.build
+build/android/qtcreator/android/.gradle
+build/android/qtcreator/android/.idea
+build/android/qtcreator/android/android.iml
+build/android/qtcreator/android/gradle.properties
+build/android/qtcreator/android/local.properties
+
 # Exclude test .cpp files (generated during the build)
 test_*.cpp
 source/ps/tests/stub_impl_hack.cpp

new file uild/android/qtcreator/android/AndroidManifest.xml

@@ +1 @@
+<?xml version="1.0"?>
+<manifest package="com.play0ad" xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionCode="1"
+          android:versionName="1.0"
+          android:installLocation="auto">
+    <application android:hardwareAccelerated="true"
+                 android:label="@string/app_name"
+                 android:icon="@drawable/zeroad">
+
+        <activity android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:name="com.play0ad.Activity" android:icon="@drawable/zeroad" android:label="@string/app_name"
+                  android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
+                  android:screenOrientation="landscape"
+                  android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+        </activity>
+
+    </application>
+    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="14"/>
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- OpenGL ES 2.0 -->
+    <uses-feature android:glEsVersion="0x00020000"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
+    <!-- %%INSERT_PERMISSIONS -->
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+    <!-- %%INSERT_FEATURES -->
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+</manifest>

new file uild/android/qtcreator/android/build.gradle

@@ +1 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+    }
+}
+
+apply plugin: 'android'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+android {
+    /*******************************************************
+     * The following variables:
+     * - androidBuildToolsVersion,
+     * - androidCompileSdkVersion
+     * - qt5AndroidDir - holds the path to qt android files
+     *                   needed to build any Qt application
+     *                   on Android.
+     *
+     * are defined in gradle.properties file. This file is
+     * updated by QtCreator and androiddeployqt tools.
+     * Changing them manually might break the compilation!
+     *******************************************************/
+
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
+    buildToolsVersion androidBuildToolsVersion
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            res.srcDirs = ['res']
+            resources.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}

new file uild/android/qtcreator/android/gradle/wrapper/gradle-wrapper.properties

@@ +1 @@
+#Sat Dec 27 09:55:37 EET 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

new file uild/android/qtcreator/android/gradlew

@@ +1 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

new file uild/android/qtcreator/android/gradlew.bat

@@ +1 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

new file uild/android/qtcreator/android/res/values/libs.xml

@@ +1 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <array name="qt_sources">
+        <item>https://download.qt-project.org/ministro/android/qt5/qt-5.4</item>
+    </array>
+
+    <!-- The following is handled automatically by the deployment tool. It should
+         not be edited manually. -->
+
+    <array name="bundled_libs">
+        <!-- %%INSERT_EXTRA_LIBS%% -->
+    </array>
+
+     <array name="qt_libs">
+         <!-- %%INSERT_QT_LIBS%% -->
+     </array>
+
+    <array name="bundled_in_lib">
+        <!-- %%INSERT_BUNDLED_IN_LIB%% -->
+    </array>
+    <array name="bundled_in_assets">
+        <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
+    </array>
+
+</resources>

new file uild/android/qtcreator/android/res/values/strings.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">0 A.D.</string>
+</resources>

new file uild/android/qtcreator/android/src/com/play0ad/Activity.java

@@ +1 @@
+package com.play0ad;
+
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.View;
+
+import org.libsdl.app.SDLActivity;
+
+import java.io.File;
+
+
+public class Activity extends SDLActivity {
+
+    private static final String TAG = "pyrogenesis";
+    private QtCreatorDebugger m_debugger = new QtCreatorDebugger(TAG);
+
+    static String getPath(File f) {
+        if (!f.exists())
+            f.mkdirs();
+        return f.getAbsolutePath();
+    }
+
+    @Override
+    protected boolean prepareOnCreate(Bundle savedInstanceState) {
+        hide();
+        if (null == savedInstanceState) {
+            try {
+                ActivityInfo activityInfo = getPackageManager().getActivityInfo(getComponentName(), PackageManager.GET_META_DATA);
+                if (activityInfo.metaData.containsKey("android.app.qt_libs_resource_id")) {
+                    int resourceId = activityInfo.metaData.getInt("android.app.qt_libs_resource_id");
+                    for (String library: getResources().getStringArray(resourceId))
+                        System.loadLibrary(library);
+                }
+
+                if (activityInfo.metaData.containsKey("android.app.bundled_libs_resource_id")) {
+                    int resourceId = activityInfo.metaData.getInt("android.app.bundled_libs_resource_id");
+                    for (String library: getResources().getStringArray(resourceId))
+                        System.loadLibrary(library);
+                }
+
+                if (activityInfo.metaData.containsKey("android.app.bundled_libs_resource_id")) {
+                    int resourceId = activityInfo.metaData.getInt("android.app.bundled_libs_resource_id");
+                    for (String library: getResources().getStringArray(resourceId))
+                        System.loadLibrary(library);
+                }
+
+                if (activityInfo.metaData.containsKey("android.app.lib_name") )
+                    System.loadLibrary(activityInfo.metaData.getString("android.app.lib_name"));
+
+                Native.setenv("TRACE_FILE", "/sdcard/0ad/appdata/logs/pyrogenesis.trace", true);
+                m_debugger.connect(this);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        int w,h;
+        if (Build.VERSION.SDK_INT < 13) {
+            Display d = getWindowManager().getDefaultDisplay();
+            w = d.getWidth();
+            h = d.getHeight();
+        } else {
+            DisplayMetrics metrics = new DisplayMetrics();
+            getWindowManager().getDefaultDisplay().getMetrics(metrics);
+            w = metrics.heightPixels;
+            h = metrics.widthPixels;
+        }
+        Native.setenv("ANDROID_SCREEN_WIDTH", Integer.toString(w), true);
+        Native.setenv("ANDROID_SCREEN_HEIGHT", Integer.toString(h), true);
+
+        Native.setenv("HOME", getPath(getFilesDir()), true);
+        Native.setenv("CACHE_DIR", getPath(getCacheDir()), true);
+        Native.setenv("EXTERNAL_DIR", getPath(getExternalFilesDir(null)), true);
+        Native.setenv("EXTERNAL_CACHE_DIR", getPath(getExternalCacheDir()), true);
+        Native.setenv("EXTERNAL_STORAGE_DIR", getPath(Environment.getExternalStorageDirectory()), true);
+
+        return super.prepareOnCreate(savedInstanceState);
+    }
+
+    public void hide() {
+        if (Build.VERSION.SDK_INT > 13) {
+            int systemVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+            if (Build.VERSION.SDK_INT > 15) {
+                systemVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN;
+                if (Build.VERSION.SDK_INT > 18)
+                    systemVisibility |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+            }
+            getWindow().getDecorView().setSystemUiVisibility(systemVisibility);
+        }
+
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        hide();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        m_debugger.close();
+        System.exit(0);
+    }
+}

new file uild/android/qtcreator/android/src/com/play0ad/Native.java

@@ +1 @@
+package com.play0ad;
+
+class Native {
+    public static native int setenv(String key, String value, boolean overwrite);
+}

new file uild/android/qtcreator/android/src/com/play0ad/QtCreatorDebugger.java

@@ +1 @@
+package com.play0ad;
+
+import android.app.Activity;
+import android.net.LocalServerSocket;
+import android.net.LocalSocket;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class QtCreatorDebugger {
+
+    QtCreatorDebugger(){}
+
+    QtCreatorDebugger(String TAG) {
+        this.TAG =TAG;
+    }
+
+    private String TAG = "QtCreator";
+
+    private Process m_debuggerProcess = null; // debugger process
+
+    public boolean connect(Activity activity) {
+        try {
+            Bundle extras = activity.getIntent().getExtras();
+
+            if ( /*(ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0
+                        &&*/ extras.containsKey("debug_ping")
+                    && extras.getString("debug_ping").equals("true")) {
+                try {
+                    debugLog("extra parameters: " + extras);
+                    String packageName = activity.getPackageName();
+                    String pingFile = extras.getString("ping_file");
+                    String pongFile = extras.getString("pong_file");
+                    String gdbserverSocket = extras.getString("gdbserver_socket");
+                    String gdbserverCommand = extras.getString("gdbserver_command");
+                    String pingSocket = extras.getString("ping_socket");
+                    boolean usePing = pingFile != null;
+                    boolean usePong = pongFile != null;
+                    boolean useSocket = gdbserverSocket != null;
+                    boolean usePingSocket = pingSocket != null;
+                    int napTime = 200; // milliseconds between file accesses
+                    int timeOut = 30000; // ms until we give up on ping and pong
+                    int maxAttempts = timeOut / napTime;
+
+                    if (gdbserverSocket != null) {
+                        debugLog("removing gdb socket " + gdbserverSocket);
+                        new File(gdbserverSocket).delete();
+                    }
+
+                    if (usePing) {
+                        debugLog("removing ping file " + pingFile);
+                        File ping = new File(pingFile);
+                        if (ping.exists()) {
+                            if (!ping.delete())
+                                debugLog("ping file cannot be deleted");
+                        }
+                    }
+
+                    if (usePong) {
+                        debugLog("removing pong file " + pongFile);
+                        File pong = new File(pongFile);
+                        if (pong.exists()) {
+                            if (!pong.delete())
+                                debugLog("pong file cannot be deleted");
+                        }
+                    }
+
+                    debugLog("starting " + gdbserverCommand);
+                    m_debuggerProcess = Runtime.getRuntime().exec(gdbserverCommand);
+                    debugLog("gdbserver started");
+
+                    if (useSocket) {
+                        int i;
+                        for (i = 0; i < maxAttempts; ++i) {
+                            debugLog("waiting for socket at " + gdbserverSocket + ", attempt " + i);
+                            File file = new File(gdbserverSocket);
+                            if (file.exists()) {
+                                file.setReadable(true, false);
+                                file.setWritable(true, false);
+                                file.setExecutable(true, false);
+                                break;
+                            }
+                            Thread.sleep(napTime);
+                        }
+
+                        if (i == maxAttempts) {
+                            debugLog("time out when waiting for debug socket");
+                            return false;
+                        }
+
+                        debugLog("socket ok");
+                    } else {
+                        debugLog("socket not used");
+                    }
+
+                    if (usePingSocket) {
+                        DebugWaitRunnable runnable = new DebugWaitRunnable(pingSocket);
+                        Thread waitThread = new Thread(runnable);
+                        waitThread.start();
+
+                        int i;
+                        for (i = 0; i < maxAttempts && waitThread.isAlive(); ++i) {
+                            debugLog("Waiting for debug socket connect");
+                            debugLog("go to sleep");
+                            Thread.sleep(napTime);
+                        }
+
+                        if (i == maxAttempts) {
+                            debugLog("time out when waiting for ping socket");
+                            runnable.shutdown();
+                            return false;
+                        }
+
+                        if (runnable.wasFailure) {
+                            debugLog("Could not connect to debug client");
+                            return false;
+                        } else {
+                            debugLog("Got pid acknowledgment");
+                        }
+                    }
+
+                    if (usePing) {
+                        // Tell we are ready.
+                        debugLog("writing ping at " + pingFile);
+                        FileWriter writer = new FileWriter(pingFile);
+                        writer.write("" + android.os.Process.myPid());
+                        writer.close();
+                        File file = new File(pingFile);
+                        file.setReadable(true, false);
+                        file.setWritable(true, false);
+                        file.setExecutable(true, false);
+                        debugLog("wrote ping");
+                    } else {
+                        debugLog("ping not requested");
+                    }
+
+                    // Wait until other side is ready.
+                    if (usePong) {
+                        int i;
+                        for (i = 0; i < maxAttempts; ++i) {
+                            debugLog("waiting for pong at " + pongFile + ", attempt " + i);
+                            File file = new File(pongFile);
+                            if (file.exists()) {
+                                file.delete();
+                                break;
+                            }
+                            debugLog("go to sleep");
+                            Thread.sleep(napTime);
+                        }
+                        debugLog("Removing pingFile " + pingFile);
+                        new File(pingFile).delete();
+
+                        if (i == maxAttempts) {
+                            debugLog("time out when waiting for pong file");
+                            return false;
+                        }
+
+                        debugLog("got pong " + pongFile);
+                    } else {
+                        debugLog("pong not requested");
+                    }
+
+                } catch (Exception e) {
+                    debugLog("Can't start debugger" + e.getMessage());
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    void close()
+    {
+        if (m_debuggerProcess != null)
+            m_debuggerProcess.destroy();
+    }
+
+    private void debugLog(String msg)
+    {
+        Log.i(TAG, "DEBUGGER: " + msg);
+    }
+
+    private class DebugWaitRunnable implements Runnable {
+
+        public DebugWaitRunnable(String pingPongSocket) throws IOException {
+            socket = new LocalServerSocket(pingPongSocket);
+        }
+
+        public boolean wasFailure;
+        private LocalServerSocket socket;
+
+        public void run() {
+            final int napTime = 200; // milliseconds between file accesses
+            final int timeOut = 30000; // ms until we give up on ping and pong
+            final int maxAttempts = timeOut / napTime;
+
+            try {
+                LocalSocket connectionFromClient = socket.accept();
+                debugLog("Debug socket accepted");
+                BufferedReader inFromClient =
+                        new BufferedReader(new InputStreamReader(connectionFromClient.getInputStream()));
+                DataOutputStream outToClient = new DataOutputStream(connectionFromClient.getOutputStream());
+                outToClient.writeBytes("" + android.os.Process.myPid());
+
+                for (int i = 0; i < maxAttempts; i++) {
+                    String clientData = inFromClient.readLine();
+                    debugLog("Incoming socket " + clientData);
+                    if (!clientData.isEmpty())
+                        break;
+
+                    if (connectionFromClient.isClosed()) {
+                        wasFailure = true;
+                        break;
+                    }
+                    Thread.sleep(napTime);
+                }
+            } catch (IOException ioEx) {
+                ioEx.printStackTrace();
+                wasFailure = true;
+                debugLog("Can't start debugger" + ioEx.getMessage());
+            } catch (InterruptedException interruptEx) {
+                wasFailure = true;
+                debugLog("Can't start debugger" + interruptEx.getMessage());
+            }
+        }
+
+        public void shutdown() throws IOException
+        {
+            wasFailure = true;
+            try {
+                socket.close();
+            } catch (IOException ignored) { }
+        }
+    };
+}

new file uild/android/qtcreator/android/src/org/libsdl/app/SDLActivity.java

@@ +1 @@
+package org.libsdl.app;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import android.app.*;
+import android.content.*;
+import android.view.*;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsoluteLayout;
+import android.net.*;
+import android.os.*;
+import android.util.Log;
+import android.graphics.*;
+import android.media.*;
+import android.hardware.*;
+
+
+/**
+    SDL Activity
+*/
+public class SDLActivity extends Activity {
+    private static final String TAG = "SDL";
+
+    // Keep track of the paused state
+    public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
+    public static boolean mExitCalledFromJava;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static View mTextEdit;
+    protected static ViewGroup mLayout;
+    protected static SDLJoystickHandler mJoystickHandler;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+    
+    // Audio
+    protected static AudioTrack mAudioTrack;
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mJoystickHandler = null;
+        mSDLThread = null;
+        mAudioTrack = null;
+        mExitCalledFromJava = false;
+        mIsPaused = false;
+        mIsSurfaceReady = false;
+        mHasFocus = true;
+    }
+
+    protected boolean prepareOnCreate(Bundle savedInstanceState)
+    {
+        return true;
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v("SDL", "onCreate():" + mSingleton);
+        super.onCreate(savedInstanceState);
+        if (!prepareOnCreate(savedInstanceState)) {
+            finish();
+            return;
+        }
+
+        SDLActivity.initialize();
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+
+        // Set up the surface
+        mSurface = new SDLSurface(getApplication());
+        
+        if(Build.VERSION.SDK_INT >= 12) {
+            mJoystickHandler = new SDLJoystickHandler_API12();
+        }
+        else {
+            mJoystickHandler = new SDLJoystickHandler();
+        }
+
+        mLayout = new AbsoluteLayout(this);
+        mLayout.addView(mSurface);
+
+        setContentView(mLayout);
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v("SDL", "onPause()");
+        super.onPause();
+        SDLActivity.handlePause();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v("SDL", "onResume()");
+        super.onResume();
+        SDLActivity.handleResume();
+    }
+
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
+
+        SDLActivity.mHasFocus = hasFocus;
+        if (hasFocus) {
+            SDLActivity.handleResume();
+        }
+    }
+
+    @Override
+    public void onLowMemory() {
+        Log.v("SDL", "onLowMemory()");
+        super.onLowMemory();
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v("SDL", "onDestroy()");
+        // Send a quit message to the application
+        SDLActivity.mExitCalledFromJava = true;
+        SDLActivity.nativeQuit();
+
+        // Now wait for the SDL thread to quit
+        if (SDLActivity.mSDLThread != null) {
+            try {
+                SDLActivity.mSDLThread.join();
+            } catch(Exception e) {
+                Log.v("SDL", "Problem stopping thread: " + e);
+            }
+            SDLActivity.mSDLThread = null;
+
+            //Log.v("SDL", "Finished waiting for SDL thread");
+        }
+            
+        super.onDestroy();
+        // Reset everything in case the user re opens the app
+        SDLActivity.initialize();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        int keyCode = event.getKeyCode();
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
+            ) {
+            return false;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
+     *  is the first to be called, mIsSurfaceReady should still be set
+     *  to 'true' during the call to onPause (in a usual scenario).
+     */
+    public static void handlePause() {
+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
+            SDLActivity.mIsPaused = true;
+            SDLActivity.nativePause();
+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+        }
+    }
+
+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
+     * every time we get one of those events, only if it comes after surfaceDestroyed
+     */
+    public static void handleResume() {
+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
+            SDLActivity.mIsPaused = false;
+            SDLActivity.nativeResume();
+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+        }
+    }
+        
+    /* The native thread has finished */
+    public static void handleNativeExit() {
+        SDLActivity.mSDLThread = null;
+        mSingleton.finish();
+    }
+
+
+    // Messages from the SDLMain thread
+    static final int COMMAND_CHANGE_TITLE = 1;
+    static final int COMMAND_UNUSED = 2;
+    static final int COMMAND_TEXTEDIT_HIDE = 3;
+
+    protected static final int COMMAND_USER = 0x8000;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    mTextEdit.setVisibility(View.GONE);
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+                }
+                break;
+
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        return commandHandler.sendMessage(msg);
+    }
+
+    // C functions we call
+    public static native void nativeInit();
+    public static native void nativeLowMemory();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void onNativeResize(int x, int y, int format);
+    public static native int onNativePadDown(int device_id, int keycode);
+    public static native int onNativePadUp(int device_id, int keycode);
+    public static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    public static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x, 
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native void nativeFlipBuffers();
+    public static native int nativeAddJoystick(int device_id, String name, 
+                                               int is_accelerometer, int nbuttons, 
+                                               int naxes, int nhats, int nballs);
+    public static native int nativeRemoveJoystick(int device_id);
+
+    public static void flipBuffers() {
+        SDLActivity.nativeFlipBuffers();
+    }
+
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    public static boolean sendMessage(int command, int param) {
+        return mSingleton.sendCommand(command, Integer.valueOf(param));
+    }
+
+    public static Context getContext() {
+        return mSingleton;
+    }
+
+    /**
+     * @return result of getSystemService(name) but executed on UI thread.
+     */
+    public Object getSystemServiceFromUiThread(final String name) {
+        final Object lock = new Object();
+        final Object[] results = new Object[2]; // array for writable variables
+        synchronized (lock) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    synchronized (lock) {
+                        results[0] = getSystemService(name);
+                        results[1] = Boolean.TRUE;
+                        lock.notify();
+                    }
+                }
+            });
+            if (results[1] == null) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return results[0];
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int x, int y, int w, int h) {
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+        }
+
+        @Override
+        public void run() {
+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
+                    w, h + HEIGHT_PADDING, x, y);
+
+            if (mTextEdit == null) {
+                mTextEdit = new DummyEdit(getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+        }
+    }
+
+    public static boolean showTextInput(int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+    }
+            
+    public static Surface getNativeSurface() {
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Audio
+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
+        
+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+        
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
+        
+        if (mAudioTrack == null) {
+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+            
+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+            
+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+                Log.e("SDL", "Failed during initialization of Audio Track");
+                mAudioTrack = null;
+                return -1;
+            }
+            
+            mAudioTrack.play();
+        }
+       
+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+        
+        return 0;
+    }
+    
+    public static void audioWriteShortBuffer(short[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w("SDL", "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+    
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w("SDL", "SDL audio: error return from write(byte)");
+                return;
+            }
+        }
+    }
+
+    public static void audioQuit() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack = null;
+        }
+    }
+
+    // Input
+
+    /**
+     * @return an array which may be empty but is never null.
+     */
+    public static int[] inputGetInputDeviceIds(int sources) {
+        int[] ids = InputDevice.getDeviceIds();
+        int[] filtered = new int[ids.length];
+        int used = 0;
+        for (int i = 0; i < ids.length; ++i) {
+            InputDevice device = InputDevice.getDevice(ids[i]);
+            if ((device != null) && ((device.getSources() & sources) != 0)) {
+                filtered[used++] = device.getId();
+            }
+        }
+        return Arrays.copyOf(filtered, used);
+    }
+            
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+    
+    public static void pollInputDevices() {
+        if (SDLActivity.mSDLThread != null) {
+            mJoystickHandler.pollInputDevices();
+        }
+    }
+    
+}
+
+/**
+    Simple nativeInit() runnable
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDL_main()
+        SDLActivity.nativeInit();
+
+        //Log.v("SDL", "SDL thread terminated");
+    }
+}
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful. 
+
+    Because of this, that's where we set up the SDL thread
+*/
+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected static SensorManager mSensorManager;
+    protected static Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected static float mWidth, mHeight;
+
+    // Startup    
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this); 
+    
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this); 
+        setOnTouchListener(this);   
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+        
+        if(Build.VERSION.SDK_INT >= 12) {
+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
+        }
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+    }
+    
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+        // Call this *before* setting mIsSurfaceReady to 'false'
+        SDLActivity.handlePause();
+        SDLActivity.mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
+        switch (format) {
+        case PixelFormat.A_8:
+            Log.v("SDL", "pixel format A_8");
+            break;
+        case PixelFormat.LA_88:
+            Log.v("SDL", "pixel format LA_88");
+            break;
+        case PixelFormat.L_8:
+            Log.v("SDL", "pixel format L_8");
+            break;
+        case PixelFormat.RGBA_4444:
+            Log.v("SDL", "pixel format RGBA_4444");
+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
+            break;
+        case PixelFormat.RGBA_5551:
+            Log.v("SDL", "pixel format RGBA_5551");
+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
+            break;
+        case PixelFormat.RGBA_8888:
+            Log.v("SDL", "pixel format RGBA_8888");
+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
+            break;
+        case PixelFormat.RGBX_8888:
+            Log.v("SDL", "pixel format RGBX_8888");
+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
+            break;
+        case PixelFormat.RGB_332:
+            Log.v("SDL", "pixel format RGB_332");
+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
+            break;
+        case PixelFormat.RGB_565:
+            Log.v("SDL", "pixel format RGB_565");
+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
+            break;
+        case PixelFormat.RGB_888:
+            Log.v("SDL", "pixel format RGB_888");
+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
+            break;
+        default:
+            Log.v("SDL", "pixel format unknown " + format);
+            break;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        SDLActivity.onNativeResize(width, height, sdlFormat);
+        Log.v("SDL", "Window size:" + width + "x"+height);
+
+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
+        SDLActivity.mIsSurfaceReady = true;
+        SDLActivity.onNativeSurfaceChanged();
+
+
+        if (SDLActivity.mSDLThread == null) {
+            // This is the entry point to the C app.
+            // Start up the C app thread and enable sensor input for the first time
+
+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+            SDLActivity.mSDLThread.start();
+            
+            // Set up a listener thread to catch when the native thread ends
+            new Thread(new Runnable(){
+                @Override
+                public void run(){
+                    try {
+                        SDLActivity.mSDLThread.join();
+                    }
+                    catch(Exception e){}
+                    finally{ 
+                        // Native thread has finished
+                        if (! SDLActivity.mExitCalledFromJava) {
+                            SDLActivity.handleNativeExit();
+                        }
+                    }
+                }
+            }).start();
+        }
+    }
+
+    // unused
+    @Override
+    public void onDraw(Canvas canvas) {}
+
+
+    // Key events
+    @Override
+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
+        
+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+        
+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                //Log.v("SDL", "key down: " + keyCode);
+                SDLActivity.onNativeKeyDown(keyCode);
+                return true;
+            }
+            else if (event.getAction() == KeyEvent.ACTION_UP) {
+                //Log.v("SDL", "key up: " + keyCode);
+                SDLActivity.onNativeKeyUp(keyCode);
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        final int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+        
+        switch(action) {
+            case MotionEvent.ACTION_MOVE:
+                for (i = 0; i < pointerCount; i++) {
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                }
+                break;
+            
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_DOWN:
+                // Primary pointer up/down, the index is always zero
+                i = 0;
+            case MotionEvent.ACTION_POINTER_UP:
+            case MotionEvent.ACTION_POINTER_DOWN:
+                // Non primary pointer up/down
+                if (i == -1) {
+                    i = event.getActionIndex();
+                }
+                
+                pointerFingerId = event.getPointerId(i);
+                x = event.getX(i) / mWidth;
+                y = event.getY(i) / mHeight;
+                p = event.getPressure(i);
+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                break;
+            
+            default:
+                break;
+        }
+
+        return true;
+   } 
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this, 
+                            mSensorManager.getDefaultSensor(sensortype), 
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this, 
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+    
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[1];
+                    y = -event.values[0];
+                    break;
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    break;
+            }
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
+        }
+    }    
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+    InputConnection ic;
+
+    public DummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+        // This handles the hardware keyboard input
+        if (event.isPrintingKey()) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+            return true;
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            SDLActivity.onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+        
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
+
+        return ic;
+    }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+    public SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+
+        /*
+         * This handles the keycodes from soft keyboard (and IME-translated
+         * input from hardkeyboard)
+         */
+        int keyCode = event.getKeyCode();
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (event.isPrintingKey()) {
+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+            }
+            SDLActivity.onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+
+            SDLActivity.onNativeKeyUp(keyCode);
+            return true;
+        }
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+
+        nativeCommitText(text.toString(), newCursorPosition);
+
+        return super.commitText(text, newCursorPosition);
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+
+        nativeSetComposingText(text.toString(), newCursorPosition);
+
+        return super.setComposingText(text, newCursorPosition);
+    }
+
+    public native void nativeCommitText(String text, int newCursorPosition);
+
+    public native void nativeSetComposingText(String text, int newCursorPosition);
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
+        if (beforeLength == 1 && afterLength == 0) {
+            // backspace
+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+        }
+
+        return super.deleteSurroundingText(beforeLength, afterLength);
+    }
+}
+
+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
+class SDLJoystickHandler {
+    
+    public boolean handleMotionEvent(MotionEvent event) {
+        return false;
+    }
+    
+    public void pollInputDevices() {
+    }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
+  
+    class SDLJoystick {
+        public int device_id;
+        public String name;
+        public ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> hats;
+    }
+    class RangeComparator implements Comparator<InputDevice.MotionRange>
+    {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            return arg0.getAxis() - arg1.getAxis();
+        }
+    }
+    
+    private ArrayList<SDLJoystick> mJoysticks;
+    
+    public SDLJoystickHandler_API12() {
+       
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    @Override
+    public void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+        // It helps processing the device ids in reverse order
+        // For example, in the case of the XBox 360 wireless dongle,
+        // so the first controller seen by SDL matches what the receiver
+        // considers to be the first controller
+        
+        for(int i=deviceIds.length-1; i>-1; i--) {
+            SDLJoystick joystick = getJoystick(deviceIds[i]);
+            if (joystick == null) {
+                joystick = new SDLJoystick();
+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+                    joystick.device_id = deviceIds[i];
+                    joystick.name = joystickDevice.getName();
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+                    
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges ) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
+                                range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            }
+                            else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+                    
+                    mJoysticks.add(joystick);
+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, 
+                                                  joystick.axes.size(), joystick.hats.size()/2, 0);
+                }
+            }
+        }
+        
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
+        for(int i=0; i < mJoysticks.size(); i++) {
+            int device_id = mJoysticks.get(i).device_id;
+            int j;
+            for (j=0; j < deviceIds.length; j++) {
+                if (device_id == deviceIds[j]) break;
+            }
+            if (j == deviceIds.length) {
+                removedDevices.add(device_id);
+            }
+        }
+            
+        for(int i=0; i < removedDevices.size(); i++) {
+            int device_id = removedDevices.get(i);
+            SDLActivity.nativeRemoveJoystick(device_id);
+            for (int j=0; j < mJoysticks.size(); j++) {
+                if (mJoysticks.get(j).device_id == device_id) {
+                    mJoysticks.remove(j);
+                    break;
+                }
+            }
+        }        
+    }
+    
+    protected SDLJoystick getJoystick(int device_id) {
+        for(int i=0; i < mJoysticks.size(); i++) {
+            if (mJoysticks.get(i).device_id == device_id) {
+                return mJoysticks.get(i);
+            }
+        }
+        return null;
+    }   
+    
+    @Override        
+    public boolean handleMotionEvent(MotionEvent event) {
+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
+            int actionPointerIndex = event.getActionIndex();
+            int action = event.getActionMasked();
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
+                    if ( joystick != null ) {
+                        for (int i = 0; i < joystick.axes.size(); i++) {
+                            InputDevice.MotionRange range = joystick.axes.get(i);
+                            /* Normalize the value to -1...1 */
+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
+                        }          
+                        for (int i = 0; i < joystick.hats.size(); i+=2) {
+                            int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
+                            int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
+                            SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY );
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }            
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+    // Generic Motion (mouse hover, joystick...) events go here
+    // We only have joysticks yet
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        return SDLActivity.handleJoystickMotionEvent(event);
+    }
+}

new file uild/android/qtcreator/android_support.pro

@@ +1 @@
+TARGET=android_support
+include(staticlib.pri)
+
+DEFINES+= restrict=__restrict__
+
+AS_SRCS=$$NDK_ROOT/sources/android/support
+
+SOURCES+= \
+    $$AS_SRCS/src/libdl_support.c \
+    $$AS_SRCS/src/locale_support.c \
+    $$AS_SRCS/src/math_support.c \
+    $$AS_SRCS/src/stdlib_support.c \
+    $$AS_SRCS/src/wchar_support.c \
+    $$AS_SRCS/src/locale/duplocale.c \
+    $$AS_SRCS/src/locale/freelocale.c \
+    $$AS_SRCS/src/locale/localeconv.c \
+    $$AS_SRCS/src/locale/newlocale.c \
+    $$AS_SRCS/src/locale/uselocale.c \
+    $$AS_SRCS/src/stdio/stdio_impl.c \
+    $$AS_SRCS/src/stdio/strtod.c \
+    $$AS_SRCS/src/stdio/vfprintf.c \
+    $$AS_SRCS/src/stdio/vfwprintf.c \
+    $$AS_SRCS/src/msun/e_log2.c \
+    $$AS_SRCS/src/msun/e_log2f.c \
+    $$AS_SRCS/src/msun/s_nan.c \
+    $$AS_SRCS/src/musl-ctype/iswalnum.c \
+    $$AS_SRCS/src/musl-ctype/iswalpha.c \
+    $$AS_SRCS/src/musl-ctype/iswblank.c \
+    $$AS_SRCS/src/musl-ctype/iswcntrl.c \
+    $$AS_SRCS/src/musl-ctype/iswctype.c \
+    $$AS_SRCS/src/musl-ctype/iswdigit.c \
+    $$AS_SRCS/src/musl-ctype/iswgraph.c \
+    $$AS_SRCS/src/musl-ctype/iswlower.c \
+    $$AS_SRCS/src/musl-ctype/iswprint.c \
+    $$AS_SRCS/src/musl-ctype/iswpunct.c \
+    $$AS_SRCS/src/musl-ctype/iswspace.c \
+    $$AS_SRCS/src/musl-ctype/iswupper.c \
+    $$AS_SRCS/src/musl-ctype/iswxdigit.c \
+    $$AS_SRCS/src/musl-ctype/towctrans.c \
+    $$AS_SRCS/src/musl-ctype/wcswidth.c \
+    $$AS_SRCS/src/musl-ctype/wctrans.c \
+    $$AS_SRCS/src/musl-ctype/wcwidth.c \
+    $$AS_SRCS/src/musl-locale/catclose.c \
+    $$AS_SRCS/src/musl-locale/catgets.c \
+    $$AS_SRCS/src/musl-locale/catopen.c \
+    $$AS_SRCS/src/musl-locale/iconv.c \
+    $$AS_SRCS/src/musl-locale/intl.c \
+    $$AS_SRCS/src/musl-locale/isalnum_l.c \
+    $$AS_SRCS/src/musl-locale/isalpha_l.c \
+    $$AS_SRCS/src/musl-locale/isblank_l.c \
+    $$AS_SRCS/src/musl-locale/iscntrl_l.c \
+    $$AS_SRCS/src/musl-locale/isdigit_l.c \
+    $$AS_SRCS/src/musl-locale/isgraph_l.c \
+    $$AS_SRCS/src/musl-locale/islower_l.c \
+    $$AS_SRCS/src/musl-locale/isprint_l.c \
+    $$AS_SRCS/src/musl-locale/ispunct_l.c \
+    $$AS_SRCS/src/musl-locale/isspace_l.c \
+    $$AS_SRCS/src/musl-locale/isupper_l.c \
+    $$AS_SRCS/src/musl-locale/iswalnum_l.c \
+    $$AS_SRCS/src/musl-locale/iswalpha_l.c \
+    $$AS_SRCS/src/musl-locale/iswblank_l.c \
+    $$AS_SRCS/src/musl-locale/iswcntrl_l.c \
+    $$AS_SRCS/src/musl-locale/iswctype_l.c \
+    $$AS_SRCS/src/musl-locale/iswdigit_l.c \
+    $$AS_SRCS/src/musl-locale/iswgraph_l.c \
+    $$AS_SRCS/src/musl-locale/iswlower_l.c \
+    $$AS_SRCS/src/musl-locale/iswprint_l.c \
+    $$AS_SRCS/src/musl-locale/iswpunct_l.c \
+    $$AS_SRCS/src/musl-locale/iswspace_l.c \
+    $$AS_SRCS/src/musl-locale/iswupper_l.c \
+    $$AS_SRCS/src/musl-locale/iswxdigit_l.c \
+    $$AS_SRCS/src/musl-locale/isxdigit_l.c \
+    $$AS_SRCS/src/musl-locale/langinfo.c \
+    $$AS_SRCS/src/musl-locale/strcasecmp_l.c \
+    $$AS_SRCS/src/musl-locale/strcoll.c \
+    $$AS_SRCS/src/musl-locale/strerror_l.c \
+    $$AS_SRCS/src/musl-locale/strfmon.c \
+    $$AS_SRCS/src/musl-locale/strftime_l.c \
+    $$AS_SRCS/src/musl-locale/strncasecmp_l.c \
+    $$AS_SRCS/src/musl-locale/strxfrm.c \
+    $$AS_SRCS/src/musl-locale/tolower_l.c \
+    $$AS_SRCS/src/musl-locale/toupper_l.c \
+    $$AS_SRCS/src/musl-locale/towctrans_l.c \
+    $$AS_SRCS/src/musl-locale/towlower_l.c \
+    $$AS_SRCS/src/musl-locale/towupper_l.c \
+    $$AS_SRCS/src/musl-locale/wcscoll.c \
+    $$AS_SRCS/src/musl-locale/wcsxfrm.c \
+    $$AS_SRCS/src/musl-locale/wctrans_l.c \
+    $$AS_SRCS/src/musl-locale/wctype_l.c \
+    $$AS_SRCS/src/musl-math/frexp.c \
+    $$AS_SRCS/src/musl-math/frexpf.c \
+    $$AS_SRCS/src/musl-math/frexpl.c \
+    $$AS_SRCS/src/musl-multibyte/btowc.c \
+    $$AS_SRCS/src/musl-multibyte/internal.c \
+    $$AS_SRCS/src/musl-multibyte/mblen.c \
+    $$AS_SRCS/src/musl-multibyte/mbrlen.c \
+    $$AS_SRCS/src/musl-multibyte/mbrtowc.c \
+    $$AS_SRCS/src/musl-multibyte/mbsinit.c \
+    $$AS_SRCS/src/musl-multibyte/mbsnrtowcs.c \
+    $$AS_SRCS/src/musl-multibyte/mbsrtowcs.c \
+    $$AS_SRCS/src/musl-multibyte/mbstowcs.c \
+    $$AS_SRCS/src/musl-multibyte/mbtowc.c \
+    $$AS_SRCS/src/musl-multibyte/wcrtomb.c \
+    $$AS_SRCS/src/musl-multibyte/wcsnrtombs.c \
+    $$AS_SRCS/src/musl-multibyte/wcsrtombs.c \
+    $$AS_SRCS/src/musl-multibyte/wcstombs.c \
+    $$AS_SRCS/src/musl-multibyte/wctob.c \
+    $$AS_SRCS/src/musl-multibyte/wctomb.c \
+    $$AS_SRCS/src/musl-stdio/printf.c \
+    $$AS_SRCS/src/musl-stdio/snprintf.c \
+    $$AS_SRCS/src/musl-stdio/sprintf.c \
+    $$AS_SRCS/src/musl-stdio/vprintf.c \
+    $$AS_SRCS/src/musl-stdio/vsprintf.c \
+    $$AS_SRCS/src/musl-stdio/swprintf.c \
+    $$AS_SRCS/src/musl-stdio/vwprintf.c \
+    $$AS_SRCS/src/musl-stdio/wprintf.c \
+    $$AS_SRCS/src/wcstox/floatscan.c \
+    $$AS_SRCS/src/wcstox/intscan.c \
+    $$AS_SRCS/src/wcstox/shgetc.c \
+    $$AS_SRCS/src/wcstox/wcstol.c \
+    $$AS_SRCS/src/wcstox/wcstod.c

new file uild/android/qtcreator/atlas.pro

@@ +1 @@
+TARGET=atlas
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/tools/atlas/GameInterface/*.cpp
+HEADERS+=$$SRCS_PATH/tools/atlas/GameInterface/*.h
+
+SOURCES+=$$SRCS_PATH/tools/atlas/GameInterface/Handlers/*.cpp
+HEADERS+=$$SRCS_PATH/tools/atlas/GameInterface/Handlers/*.h

new file uild/android/qtcreator/common.pri

@@ +1 @@
+QT=
+
+OBJECTS_DIR =.$$TARGET
+
+QMAKE_CFLAGS +=  -Wno-unused-parameter -Wno-parentheses  -Wno-sign-compare
+QMAKE_CXXFLAGS += -Wno-unused-local-typedefs -Wno-reorder -Wno-unused-parameter -Wno-parentheses -Wno-sign-compare
+
+DEPENDENCIES_PATH = $$PWD/../../../libraries/android/$$ANDROID_ARCHITECTURE
+
+DEFINES +=  \
+            U_HAVE_STD_STRING \
+            CONFIG2_NVTT=0 CONFIG2_MINIUPNPC=1 \
+            CONFIG2_GLES=1 CONFIG2_AUDIO=1
+
+SRCS_PATH=$$PWD/../../../source
+
+INCLUDEPATH +=  \
+            $$NDK_ROOT/sources/android/support/include \
+            $$DEPENDENCIES_PATH/include $$DEPENDENCIES_PATH/include/SDL2 \
+            $$DEPENDENCIES_PATH/include/mozjs-31 $$DEPENDENCIES_PATH/include/libxml2 \
+            $$DEPENDENCIES_PATH/include/miniupnpc $$SRCS_PATH/third_party/tinygettext/include \
+            $$PWD/../../../source $$PWD/../../../source/pch/$$TARGET
+
+PCH_FILE=$$PWD/../../../source/pch/$$TARGET/precompiled.h
+exists($$PCH_FILE):PRECOMPILED_HEADER = $$PWD/../../../source/pch/$$TARGET/precompiled.h

new file uild/android/qtcreator/engine.pro

@@ +1 @@
+TARGET=engine
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/ps/*.cpp
+HEADERS+=$$SRCS_PATH/ps/*.h
+
+SOURCES+=$$SRCS_PATH/ps/scripting/*.cpp
+HEADERS+=$$SRCS_PATH/ps/scripting/*.h
+
+SOURCES+=$$SRCS_PATH/ps/GameSetup/*.cpp
+HEADERS+=$$SRCS_PATH/ps/GameSetup/*.h
+
+SOURCES+=$$SRCS_PATH/ps/XML/*.cpp
+HEADERS+=$$SRCS_PATH/ps/XML/*.h
+
+SOURCES+=$$SRCS_PATH/soundmanager/*.cpp
+HEADERS+=$$SRCS_PATH/soundmanager/*.h
+
+SOURCES+=$$SRCS_PATH/soundmanager/data/*.cpp
+HEADERS+=$$SRCS_PATH/soundmanager/data/*.h
+
+SOURCES+=$$SRCS_PATH/soundmanager/items/*.cpp
+HEADERS+=$$SRCS_PATH/soundmanager/items/*.h
+
+SOURCES+=$$SRCS_PATH/soundmanager/scripting/*.cpp
+HEADERS+=$$SRCS_PATH/soundmanager/scripting/*.h
+
+SOURCES+=$$SRCS_PATH/maths/*.cpp
+HEADERS+=$$SRCS_PATH/maths/*.h
+
+SOURCES+=$$SRCS_PATH/i18n/*.cpp
+HEADERS+=$$SRCS_PATH/i18n/*.h
+
+SOURCES+=$$SRCS_PATH/i18n/scripting/*.cpp
+HEADERS+=$$SRCS_PATH/i18n/scripting/*.h
+
+SOURCES+=$$SRCS_PATH/third_party/cppformat/*.cpp
+HEADERS+=$$SRCS_PATH/third_party/cppformat/*.h

new file uild/android/qtcreator/graphics.pro

@@ +1 @@
+TARGET=graphics
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/renderer/*.cpp
+HEADERS+=$$SRCS_PATH/renderer/*.h
+
+SOURCES+=$$SRCS_PATH/renderer/scripting/*.cpp
+HEADERS+=$$SRCS_PATH/renderer/scripting/*.h
+
+SOURCES+=$$SRCS_PATH/third_party/mikktspace/*.cpp
+HEADERS+=$$SRCS_PATH/third_party/mikktspace/*.h

new file uild/android/qtcreator/gui.pro

@@ +1 @@
+TARGET=gui
+include(staticlib.pri)

new file uild/android/qtcreator/lobby.pro

@@ +1 @@
+TARGET=lobby
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/lobby/glooxwrapper/*.cpp
+HEADERS+=$$SRCS_PATH/lobby/glooxwrapper/*.h
+
+SOURCES+=$$SRCS_PATH/third_party/encryption/*.cpp
+HEADERS+=$$SRCS_PATH/third_party/encryption/*.h

new file uild/android/qtcreator/lowlevel.pro

@@ +1 @@
+TARGET=lowlevel
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/lib/*.cpp
+HEADERS+=$$SRCS_PATH/lib/*.h
+
+HEADERS+=$$SRCS_PATH/lib/adts/*.h
+
+SOURCES+=$$SRCS_PATH/lib/allocators/*.cpp
+HEADERS+=$$SRCS_PATH/lib/allocators/*.h
+
+SOURCES+=$$SRCS_PATH/lib/external_libraries/*.cpp
+HEADERS+=$$SRCS_PATH/lib/external_libraries/*.h
+
+SOURCES+=$$SRCS_PATH/lib/file/*.cpp
+HEADERS+=$$SRCS_PATH/lib/file/*.h
+
+SOURCES+=$$SRCS_PATH/lib/file/archive/*.cpp
+HEADERS+=$$SRCS_PATH/lib/file/archive/*.h
+
+SOURCES+=$$SRCS_PATH/lib/file/common/*.cpp
+HEADERS+=$$SRCS_PATH/lib/file/common/*.h
+
+SOURCES+=$$SRCS_PATH/lib/file/io/*.cpp
+HEADERS+=$$SRCS_PATH/lib/file/io/*.h
+
+SOURCES+=$$SRCS_PATH/lib/file/vfs/*.cpp
+HEADERS+=$$SRCS_PATH/lib/file/vfs/*.h
+
+HEADERS+=$$SRCS_PATH/lib/pch/*.h
+
+SOURCES+=$$SRCS_PATH/lib/posix/*.cpp
+HEADERS+=$$SRCS_PATH/lib/posix/*.h
+
+SOURCES+=$$SRCS_PATH/lib/res/*.cpp
+HEADERS+=$$SRCS_PATH/lib/res/*.h
+
+SOURCES+=$$SRCS_PATH/lib/res/graphics/*.cpp
+HEADERS+=$$SRCS_PATH/lib/res/graphics/*.h
+
+SOURCES+=$$SRCS_PATH/lib/tex/*.cpp
+HEADERS+=$$SRCS_PATH/lib/tex/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/arch/arm/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/arch/arm/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/os/unix/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/os/unix/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/os/linux/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/os/linux/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/os/android/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/os/android/*.h
+
+SOURCES+=$$SRCS_PATH/lib/sysdep/rtl/gcc/*.cpp
+HEADERS+=$$SRCS_PATH/lib/sysdep/rtl/gcc/*.h

new file uild/android/qtcreator/main.pro

@@ +1 @@
+TARGET=main
+include(common.pri)
+
+SDL_SRCS=$$DEPENDENCIES_PATH/SDL2/src
+
+SOURCES += $$PWD/../../../source/main.cpp \
+       $$SDL_SRCS/main/android/SDL_android_main.c
+
+LIBS += -L$$OUT_PWD -Wl,--start-group \
+        -lgui -lsimulation2 -lgraphics -latlas -lengine -lnetwork \
+        -lscriptinterface -ltinygettext -lmongoose -llowlevel \
+        -llobby -Wl,--end-group -lSDL  -landroid_support\
+        -L$$DEPENDENCIES_PATH/lib -lpng -ljpeg -lxml2 -lmozjs-31 \
+        -lgloox -lopenal -lcommon -lvorbisfile -lvorbis -logg \
+        -lminiupnpc -licui18n -licuio -licule -liculx -licuuc -licudata \
+        -lenet -lboost_filesystem -lboost_system -lcurl -lssl -lcrypto -lm
+
+apitrace: exists($$DEPENDENCIES_PATH/lib/apitrace/wrappers/libegltrace.so) {
+        ANDROID_EXTRA_LIBS += $$DEPENDENCIES_PATH/lib/apitrace/wrappers/libegltrace.so
+        LIBS += -L$$DEPENDENCIES_PATH/lib/apitrace/wrappers -legltrace
+} else {
+        LIBS += -lGLESv2 -lGLESv1_CM
+}
+
+LIBS += -lOpenSLES -landroid
+
+DISTFILES += \
+    android/gradle/wrapper/gradle-wrapper.jar \
+    android/AndroidManifest.xml \
+    android/gradlew.bat \
+    android/res/values/libs.xml \
+    android/build.gradle \
+    android/gradle/wrapper/gradle-wrapper.properties \
+    android/gradlew \
+    android/src/org/libsdl/app/SDLActivity.java \
+    android/res/drawable/zeroad.png \
+    android/res/values/strings.xml \
+    android/src/com/play0ad/Activity.java \
+    android/src/com/play0ad/Native.java \
+    android/src/com/play0ad/QtCreatorDebugger.java
+
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

new file uild/android/qtcreator/mongoose.pro

@@ +1 @@
+TARGET=mongoose
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/third_party/mongoose/*.cpp
+HEADERS+=$$SRCS_PATH/third_party/mongoose/*.h

new file uild/android/qtcreator/network.pro

@@ +1 @@
+TARGET=network
+include(staticlib.pri)

new file uild/android/qtcreator/qtcreator.pro

@@ +1 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+!android: error("Use only on Android");
+
+DEPENDENCIES_PATH = $$PWD/../../../libraries/android/$$ANDROID_ARCHITECTURE
+
+!exists($$DEPENDENCIES_PATH/SDL2): {
+    warning("Dependencies $$DEPENDENCIES_PATH are not setup.\nRunning setup-libs.sh, please be patient ...")
+    system($$PWD/../setup-libs.sh -n $$NDK_ROOT -a $$ANDROID_ARCHITECTURE)
+    !exists($$DEPENDENCIES_PATH/SDL2): error("setup-libs.sh failed, please run it manually and check the oputput")
+                                 else: warning("Dependencies compiled, please reload the project!")
+}
+
+SUBDIRS += \
+    android_support.pro \
+    sdl.pro \
+    mongoose.pro \
+    tinygettext.pro \
+    lowlevel.pro \
+    network.pro \
+    lobby.pro \
+    simulation2.pro\
+    scriptinterface.pro \
+    graphics.pro \
+    gui.pro \
+    atlas.pro \
+    engine.pro \
+    main.pro

new file uild/android/qtcreator/scriptinterface.pro

@@ +1 @@
+TARGET=scriptinterface
+include(staticlib.pri)
+

new file uild/android/qtcreator/sdl.pro

@@ +1 @@
+TARGET = SDL
+include(staticlib.pri)
+
+# ADD SDL SRCS
+SDL_SRCS=$$DEPENDENCIES_PATH/SDL2/src
+DEFINES += GL_GLEXT_PROTOTYPES
+SOURCES += \
+    $$files($$SDL_SRCS/*.c) \
+    $$files($$SDL_SRCS/audio/*.c) \
+    $$files($$SDL_SRCS/audio/android/*.c) \
+    $$files($$SDL_SRCS/audio/dummy/*.c) \
+    $$files($$SDL_SRCS/atomic/*.c) \
+    $$files($$SDL_SRCS/core/android/*.c) \
+    $$files($$SDL_SRCS/cpuinfo/*.c) \
+    $$files($$SDL_SRCS/dynapi/*.c) \
+    $$files($$SDL_SRCS/events/*.c) \
+    $$files($$SDL_SRCS/file/*.c) \
+    $$files($$SDL_SRCS/haptic/*.c) \
+    $$files($$SDL_SRCS/haptic/dummy/*.c) \
+    $$files($$SDL_SRCS/joystick/*.c) \
+    $$files($$SDL_SRCS/joystick/android/*.c) \
+    $$files($$SDL_SRCS/loadso/dlopen/*.c) \
+    $$files($$SDL_SRCS/power/*.c) \
+    $$files($$SDL_SRCS/power/android/*.c) \
+    $$files($$SDL_SRCS/filesystem/dummy/*.c) \
+    $$files($$SDL_SRCS/render/*.c) \
+    $$files($$SDL_SRCS/render/software/*.c) \
+    $$files($$SDL_SRCS/render/opengles/*.c) \
+    $$files($$SDL_SRCS/render/opengles2/*.c) \
+    $$files($$SDL_SRCS/stdlib/*.c) \
+    $$files($$SDL_SRCS/thread/*.c) \
+    $$files($$SDL_SRCS/thread/pthread/*.c) \
+    $$files($$SDL_SRCS/timer/*.c) \
+    $$files($$SDL_SRCS/timer/unix/*.c) \
+    $$files($$SDL_SRCS/video/*.c) \
+    $$files($$SDL_SRCS/video/android/*.c)

new file uild/android/qtcreator/simulation2.pro

@@ +1 @@
+TARGET=simulation2
+include(staticlib.pri)
+
+SOURCES+=$$SRCS_PATH/$$TARGET/components/*.cpp
+HEADERS+=$$SRCS_PATH/$$TARGET/components/*.h
+
+SOURCES+=$$SRCS_PATH/$$TARGET/helpers/*.cpp
+HEADERS+=$$SRCS_PATH/$$TARGET/helpers/*.h
+
+SOURCES+=$$SRCS_PATH/$$TARGET/serialization/*.cpp
+HEADERS+=$$SRCS_PATH/$$TARGET/serialization/*.h
+
+SOURCES+=$$SRCS_PATH/$$TARGET/system/*.cpp
+HEADERS+=$$SRCS_PATH/$$TARGET/system/*.h

new file uild/android/qtcreator/staticlib.pri

@@ +1 @@
+TEMPLATE = lib
+CONFIG += staticlib
+
+include(common.pri)
+
+exists($$SRCS_PATH/$$TARGET): {
+    SOURCES+=$$SRCS_PATH/$$TARGET/*.cpp
+    HEADERS+=$$SRCS_PATH/$$TARGET/*.h
+}
+
+exists($$SRCS_PATH/$$TARGET/scripting): {
+    SOURCES+=$$SRCS_PATH/$$TARGET/scripting/*.cpp
+    HEADERS+=$$SRCS_PATH/$$TARGET/scripting/*.h
+}
+
+QMAKE_POST_LINK += $$QMAKE_DEL_FILE $$OUT_PWD/*.so

new file uild/android/qtcreator/tinygettext.pro

@@ +1 @@
+TARGET=tinygettext
+include(staticlib.pri)
+
+INCLUDEPATH += $$PWD/../../../source/third_party/$$TARGET/include/$$TARGET
+
+SOURCES+=$$SRCS_PATH/third_party/$$TARGET/src/*.c*
+HEADERS+=$$PWD/../../../source/third_party/$$TARGET/include/$$TARGET/*.h*

source/lib/sysdep/os/android/android.cpp

@@ -46 +46 @@
 
 Status GetVideoMode(int* xres, int* yres, int* bpp, int* freq)
 {
-#warning TODO: implement gfx::GetVideoMode properly for Android
-
     if(xres)
-        *xres = 800;
+        *xres = atoi(getenv("ANDROID_SCREEN_WIDTH"));
 
     if(yres)
-        *yres = 480;
+        *yres = atoi(getenv("ANDROID_SCREEN_HEIGHT"));
 
     if(bpp)
         *bpp = 32;
@@ -117 +115 @@
 {
     return INFO::OK;
 }
-

source/lib/sysdep/os/linux/lcpu.cpp

@@ -27 +27 @@
 #include "lib/bits.h"
 #include "lib/module_init.h"
 
-#if OS_LINUX
-#include "valgrind.h"
+#if OS_LINUX && !OS_ANDROID
+# include "valgrind.h"
 #endif
 
 
@@ -41 +41 @@
         // Valgrind reports the number of real CPUs, but only emulates a single CPU.
         // That causes problems when we expect all those CPUs to be distinct, so
         // just pretend there's only one CPU
+#if !OS_ANDROID
         if (RUNNING_ON_VALGRIND)
             numProcessors = 1;
         else
+#endif
         {
             long res = sysconf(_SC_NPROCESSORS_CONF);
             ENSURE(res != -1);

source/lib/sysdep/os/unix/unix_executable_pathname.cpp

@@ -25 +25 @@
 #include "lib/sysdep/sysdep.h"
 
 #define GNU_SOURCE
-#include "mocks/dlfcn.h"
-#include "mocks/unistd.h"
+#if OS_ANDROID
+# include <dlfcn.h>
+# include <unistd.h>
+#define T
+#else
+# include "mocks/dlfcn.h"
+# include "mocks/unistd.h"
+#endif
 
 #include <cstdio>
 

source/main.cpp

@@ -525 +525 @@
 }
 
 #if OS_ANDROID
-// In Android we compile the engine as a shared library, not an executable,
-// so rename main() to a different symbol that the wrapper library can load
-#undef main
-#define main pyrogenesis_main
-extern "C" __attribute__((visibility ("default"))) int main(int argc, char* argv[]);
-#endif
+#include <jni.h>
+extern"C" JNIEXPORT jint JNICALL Java_com_play0ad_Native_setenv
+  (JNIEnv* env, jclass /*clazz*/, jstring key, jstring value, jboolean overwrite)
+{
+    const char *k = env->GetStringUTFChars(key, NULL);
+    const char *v = env->GetStringUTFChars(value, NULL);
+    int err = setenv(k, v, overwrite);
+    env->ReleaseStringUTFChars(key, k);
+    env->ReleaseStringUTFChars(value, v);
+    return err;
+}
 
+extern "C" __attribute__((visibility ("default"))) int SDL_main(int argc, char* argv[])
+#else
 extern "C" int main(int argc, char* argv[])
+#endif
 {
 #if OS_UNIX
     // Don't allow people to run the game with root permissions,

source/ps/TouchInput.cpp

@@ -113 +113 @@
 
 void CTouchInput::OnFingerMotion(int id, int x, int y)
 {
+    if (!g_Game)
+        return;
+
     debug_printf(L"finger motion %d %d %d; state %d\n", id, x, y, m_State);
 
     CVector2D pos(x, y);

source/scriptinterface/ScriptInterface.cpp

@@ -41 +41 @@
 #include <boost/flyweight/no_locking.hpp>
 #include <boost/flyweight/no_tracking.hpp>
 
-#include "valgrind.h"
+#if !OS_ANDROID
+# include "valgrind.h"
+#endif
 
 #include "scriptinterface/ScriptExtraHeaders.h"