Aa

.gitignore

@@ -60,6 +60,7 @@ gradle
 /gradlew.bat
 obj/
 jniLibs/
+QEMU_VERSION
 
 jnilibs
 limbotest
@@ -69,6 +70,5 @@ limbotest
 
 sync.sh
 gitsync.sh
-/limbo-android-lib/src/main/jni/qemu.5.1.0
-/limbo-android-lib/src/main/jni/qemu.2.9.1
-
+/limbo-android-lib/src/main/jni/qemu-2.9.1/
+/limbo-android-lib/src/main/jni/qemu-5.1.0/

README.developers

@@ -14,43 +14,39 @@ https://github.com/limboemu/limbo
 2. Requirements:
 
     Android SDK
-    Android NDK: r14b/gcc or r23/clang
-    Android Studio (3.1.1 prefered)
-    Android device with Android OS 5.0 (Lollipop) and above
-    Linux Desktop pc (Ubuntu prefered)
+    Android NDK: r14b/gcc or r23b/clang
+    Android Studio (3.1.1 preferred)
+    Android device with Android OS 8.0 (Oreo) and above
+    Linux Desktop pc (Ubuntu preferred)
     Make sure you have the following packages installed, if not run:
     sudo apt-get install make autoconf automake git python binutils 
-    sudo apt-get install libtool-bin pkg-config flex bison gettext texinfo
-    For developement you can use your own editors Geany is highly 
-	recommended for the native code
+    sudo apt-get install libtool-bin pkg-config flex bison gettext texinfo rsync
+    For development you can use your own editors Geany is highly
+	recommended for editing the native code
 
 ===============================================================================
 
 3. Known Issues:
     https://github.com/limboemu/limbo/issues
 
 ===============================================================================
+
 4. Update Configuration
 
-    a. Update the path to the ndk directory in file limbo-android-lib/src/main/jni/android-limbo-config.mak
-    If you use gcc set:
-	USE_GCC ?= true
-    otherwise use:
-        USE_GCC ?= false
+    If you build the supported QEMU version then the only thing you need to do is edit file:
+    limbo-android-lib/src/main/jni/android-limbo-config.mak
+    In all other cases you have to look at the config files under:
+    limbo-android-lib/src/main/jni/android-config/
 
-    b. Add the NDK directory to your PATH variable so makefile can find ndk-build
-    Examples:
-    For bash if you use gcc:
-    export PATH=$PATH:/home/dev/tools/ndk/android-ndk-r14b
-    or if you use clang:
-    export PATH=$PATH:/home/dev/tools/ndk/android-ndk-r23
+    For more information see the Building section.
 
 
-5. Get and Patch libraries
+5. Get and Compile external libraries
 
     #Make sure you're under the jni directory
     cd ./limbo-android-lib/src/main/jni
-
+
+    # Now download the source code for the external libraries and unzip them under the jni directory
     #Note: if some of these file links don't download with wget use your browser to download them
 
     ##### Get QEMU
@@ -60,6 +56,10 @@ https://github.com/limboemu/limbo
     wget http://download.qemu-project.org/qemu-5.1.0.tar.xz -P /tmp/
     tar -xJf /tmp/qemu-5.1.0.tar.xz
     mv qemu-5.1.0 qemu
+    # For QEMU version 2.9.1:
+    wget http://download.qemu-project.org/qemu-2.9.1.tar.xz -P /tmp/
+    tar -xJf /tmp/qemu-2.9.1.tar.xz
+    mv qemu-2.9.1 qemu
 
     ##### GET glib
     wget https://ftp.gnome.org/pub/GNOME/sources/glib/2.56/glib-2.56.1.tar.xz -P /tmp/
@@ -93,19 +93,16 @@ https://github.com/limboemu/limbo
         qemu/
         SDL2/
 
+===============================================================================
+
+6. Apply patches
 
     ### Apply patch for QEMU:
     # example for 5.1.0:
-    Make sure the following line is uncommented in android-qemu-config.mak
-    include android-qemu-config-5.1.0.mak
-    Apply the patch on the terminal:
     cd ./limbo-android-lib/src/main/jni/qemu/
     patch -p1 < ../patches/qemu-5.1.0.patch
-
-    # for QEMU versions 4 and above you can enable MTTCG on the ui
-    # this will only work if your android device is 64bit
-    modify Config.java:
-        set to true: public static boolean enableMTTCG = true;
+    # for 2.9.1:
+    patch -p1 < ../patches/qemu-2.9.1.patch
 
     ### Apply glib patch for Limbo:
     cd ./limbo-android-lib/src/main/jni/glib/
@@ -116,42 +113,54 @@ https://github.com/limboemu/limbo
     patch -p1 < ../patches/sdl2-2.0.8.patch
 
     ### Other QEMU versions:
-    # If you want to distribute Limbo build with other QEMU versions, create your own patch like this:
+    # If you want to redistribute Limbo build with other QEMU versions, create your own patch like this:
     cd /limbo-android-lib/src/main/jni/qemu/
     diff -ru --no-dereference /tmp/qemu-x.x.x . | grep -v '^Only in' > ../patches/qemu-x.x.x.patch
     Don't forget to create your android-qemu-config-x.x.x.mak file
       and include it in android-qemu-config.mak
 
 ===============================================================================
-5. Build
 
-    a. To build the NDK part of the app make sure you're under the jni directory:
-        cd limbo-android-lib/src/main/jni
+7. Build
 
-    Make sure you update the android-config/android-limbo-config.mak file with the NDK path you have installed:
+    a. To build the native part of the app make sure you're under the jni directory:
+        cd limbo-android-lib/src/main/jni
+
+    Make sure you update file android-limbo-config.mak with the NDK folder to your installation folder
+    keep in mind the last NDK version  that supported gcc was r14b. The alternative is to use clang 
+    with ndk version r23. For example: 
     NDK_ROOT = /home/dev/tools/ndk/android-ndk-r14b
 
+    The rest of the configuration is for specifying the right QEMU version: USE_QEMU_VERSION
+    the host architecture (android device): BUILD_HOST
+    and the emulator guest architecture: BUILD_GUEST
+
     b. From Android Studio import BOTH the Android library limbo-android-lib AND the module for the guest
         architecture you need (x86,arm,ppc,sparc) ie limbo-android-x86.
 
     c. Build the native libraries:
-        cd limbo-android-lib/src/main/jni:
+        # Make sure you're still under the jni directory:
+        cd limbo-android-lib/src/main/jni
 
-        To build Limbo Emulator:
+        # Instead of editing android-limbo-config.mak you can also supply the variables on the command line.
+        # For example:
             export BUILD_HOST=<EABI>
             export BUILD_GUEST=<GUEST_ARCH>
             export NDK_DEBUG=<ENABLE_DEBUG>
-            make limbo
 
         where:
             EABI is the Android device type (host arch): armeabi-v7a, arm64-v8a, x86, x86_64
             GUEST_ARCH is the Emulator type: x86_64-softmmu,aarch64-softmmu,sparc64-softmmu,ppc64-softmmu
             ENABLE_DEBUG is 1 (optional)
 
+        # To start the build type on your terminal:
+            make limbo
+
+        Notes:
         If you want to remove ALL previously compiled native objects and libraries:
         make clean
 
-        If you're building apk for multiple host architectures you need to do in betweeen builds:
+        If you're building apk for multiple host architectures you need to do in between builds:
         make distclean
 
         If you're building apk for multiple guest architectures you can specify them with commas:
@@ -194,6 +203,16 @@ https://github.com/limboemu/limbo
             export BUILD_GUEST=x86_64-softmmu,aarch64-softmmu
             make limbo
 
+		8) To build limbo for older devices with gcc set the following options:
+			export NDK_ROOT=/home/dev/tools/ndk/android-ndk-r14b
+			export USE_GCC=true
+			export BUILD_HOST=armeabi-v7a
+			export BUILD_GUEST=x86_64-softmmu
+			export USE_QEMU_VERSION=2.9.1
+			export USE_AAUDIO=false
+
+		For more options see android-limbo-config.mak
+
        You should now have the following libraries in these 2 folders:
 
        limbo-android-lib/src/main/jniLibs/<EABI>/
@@ -233,8 +252,11 @@ https://github.com/limboemu/limbo
 
         Important:
            From Android studio click Build> Rebuild Project and Run > Debug
-
-    g. To debug the native code for a particular guest:
+
+===============================================================================
+
+8. Debugging
+        To debug the native code for a particular guest:
 
         # for x86 guest and ARM64 phone:
         export BUILD_HOST=arm64-v8a
@@ -261,7 +283,8 @@ https://github.com/limboemu/limbo
         To see stack (backtrace): bt
 
 ===============================================================================
-6. Development Notes
+
+9. Development Notes
 
     a. Codes Changes for Android compatibility are in patch files marked with __ANDROID__
 
@@ -274,7 +297,7 @@ https://github.com/limboemu/limbo
         limbo-android-lib/src/main/jni/android-config/android-qemu-config.mak
 
     d. Advanced Device Configuration files:
-        limbo-android-lib/src/main/jni/android-config/android-device-config/*.mak
+        limbo-android-lib/src/main/jni/android-config/android-config/*.mak
 
     e. Important Makefiles:
         limbo-android-lib/src/main/jni/Makefile
@@ -284,9 +307,16 @@ https://github.com/limboemu/limbo
         limbo-android-lib/src/main/jni/android-qemu-build.mak
 
     f. Frontend UI options configuration see: Config.java
+
+    g. When using git apply the following setting to your config file if you want to use 
+        return new lines for windows:
+    [core]
+        eol = true
+        autocrlf = input
+        fileMode = false
 
 ===============================================================================
-7. Run
+10. Run
 
     a. Installing a full Qwerty keyboard for Android like Hacker's keyboard 
         from the Google Android store. Make sure you use Transparent theme 
@@ -299,19 +329,15 @@ https://github.com/limboemu/limbo
     f. Have fun!
 
 ===============================================================================
-8. Changelog
+10. Changelog
 See limbo-android-lib/src/main/assets/CHANGELOG for release notes
 
 ===============================================================================
-9. License
+11. License
 
 Limbo PC Emulator is released under GPL v2 License.
-All icons unders /res are from Gnome Project (GPL v2 License)
+All icons under /res are from Gnome Project (GPL v2 License)
 See file COPYING under root directory
 and LICENSE under limbo-android-lib/src/main/assets
 
 Other source included are released under their own license please view Licenses under each subdirectory
-
-===============================================================================
-
-Endofdoc

README.md

@@ -1,7 +1,7 @@
 # Limbo Emulator (QEMU) for Android
 #
-# For APK Downloads, Guides, and Help visit the Limbo Wiki:
-# https://github.com/limboemu/limbo/wiki
+# For APK Downloads, Guides, and Help visit:
+# https://virtualmachinery.weebly.com
 
 Limbo is a QEMU-based emulator for Android supports emulation for these architectures:
 	x86/x86_64

VERSION

@@ -1 +1 @@
-501.00
+600.01

gradle.properties

@@ -15,15 +15,9 @@ org.gradle.jvmargs=-Xmx2000m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-
 org.gradle.daemon=true
-
 org.gradle.configureondemand=true
-
 android.enableBuildCache=true
-
-android.useDeprecatedNdk=true
-
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx2000m
+

limbo-android-arm/src/main/AndroidManifest.xml

@@ -1,83 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.limbo.emu.main.arm"
-    android:installLocation="auto"
-    android:versionCode="50100"
-    android:versionName="5.1.0-arm" >
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <uses-feature android:glEsVersion="0x00020000" />
+    android:versionCode="60001"
+    android:versionName="6.0.1-arm">
 
     <application
-        android:name="com.max2idea.android.limbo.main.LimboApplication"
-        android:allowBackup="true"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/limbo"
+        tools:replace="android:label"
         android:label="Limbo ARM Emulator"
-        android:largeHeap="true" >
+        >
         <activity
-            android:name=".LimboEmuActivity"
+            android:name="LimboEmuActivity"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:label="Limbo ARM"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:theme="@style/Theme.AppCompat.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.max2idea.android.limbo.main.LimboFileManager"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:label="File Manager" >
-        </activity>
-        <activity
-            android:name="com.max2idea.android.limbo.main.LimboSDLActivity"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:theme="@style/Theme.AppCompat.NoActionBar" >
-        </activity>
-        <activity
-            android:name="com.max2idea.android.limbo.main.LimboVNCActivity"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
-        <activity
-            android:name="com.max2idea.android.limbo.main.LimboSettingsManager"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:label="Settings" >
-        </activity>
-        <activity
-            android:name="com.max2idea.android.limbo.utils.LinksManager"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
-            android:label="Downloads" >
-        </activity>
-        <service
-            android:name="com.max2idea.android.limbo.main.LimboService"
-            android:enabled="true"
-            android:exported="false"
-            android:label="Limbo Service" >
-            <intent-filter>
-                <action android:name="com.max2idea.android.limbo.action.STARTVM" />
-            </intent-filter>
-        </service>
-
     </application>
-
 </manifest>