[Android] Remove mk and add AndroidManifest.xml

Android/jni/3rdParty/png/AndroidManifest.xml

@@ -0,0 +1 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64.png" />

Android/jni/3rdParty/png/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/3rdParty/png/png.mk

@@ -1,34 +0,0 @@
-#########################
-# png
-#########################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./3rdParty/png
-
-LOCAL_MODULE := png
-
-LOCAL_C_INCLUDES :=               \
-    ./jni/3rdParty/               \
-                
-LOCAL_SRC_FILES := \
-    $(SRCDIR)/png.c               \
-    $(SRCDIR)/pngerror.c          \
-    $(SRCDIR)/pngget.c            \
-    $(SRCDIR)/pngmem.c            \
-    $(SRCDIR)/pngpread.c          \
-    $(SRCDIR)/pngread.c           \
-    $(SRCDIR)/pngrio.c            \
-    $(SRCDIR)/pngrtran.c          \
-    $(SRCDIR)/pngrutil.c          \
-    $(SRCDIR)/pngset.c            \
-    $(SRCDIR)/pngtest.c           \
-    $(SRCDIR)/pngtrans.c          \
-    $(SRCDIR)/pngwio.c            \
-    $(SRCDIR)/pngwrite.c          \
-    $(SRCDIR)/pngwtran.c          \
-    $(SRCDIR)/pngwutil.c          \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)

Android/jni/Common/AndroidManifest.xml

@@ -0,0 +1 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64.common" />

Android/jni/Common/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+project("Common")
+
+add_library(Common STATIC
+        CriticalSection.cpp
+        DateTime.cpp
+        DynamicLibrary.cpp
+        File.cpp
+        HighResTimeStamp.cpp
+        IniFile.cpp
+        Log.cpp
+        md5.cpp
+        MemoryManagement.cpp
+        path.cpp
+        Platform.cpp
+        Random.cpp
+        StdString.cpp
+        SyncEvent.cpp
+        Thread.cpp
+        Trace.cpp
+        Util.cpp)
+
+add_definitions(-DANDROID)
+
+target_link_libraries(Common)

Android/jni/Common/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Common/common.mk

@@ -1,34 +0,0 @@
-#########################
-# common
-#########################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./Common
-
-LOCAL_MODULE := common
-
-LOCAL_C_INCLUDES := ../     \
-    $(SDL_INCLUDES)         \
-               
-LOCAL_SRC_FILES := \
-    $(SRCDIR)/CriticalSection.cpp        \
-    $(SRCDIR)/DateTimeClass.cpp          \
-    $(SRCDIR)/FileClass.cpp              \
-    $(SRCDIR)/HighResTimeStamp.cpp       \
-    $(SRCDIR)/IniFileClass.cpp           \
-    $(SRCDIR)/LogClass.cpp               \
-    $(SRCDIR)/md5.cpp                    \
-    $(SRCDIR)/MemoryManagement.cpp       \
-    $(SRCDIR)/path.cpp                   \
-    $(SRCDIR)/Platform.cpp               \
-    $(SRCDIR)/Random.cpp                 \
-    $(SRCDIR)/StdString.cpp              \
-    $(SRCDIR)/SyncEvent.cpp              \
-    $(SRCDIR)/Thread.cpp                 \
-    $(SRCDIR)/Trace.cpp                  \
-    $(SRCDIR)/Util.cpp                   \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)

Android/jni/Plugin-Input/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="emu.project64.plugin_input" />

Android/jni/Plugin-Input/PluginInput.mk

@@ -1,24 +0,0 @@
-######################
-# Project64-input-android
-######################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./PluginInput
-
-LOCAL_MODULE := Project64-input-android
-LOCAL_ARM_MODE := arm
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_SRC_FILES :=             \
-    $(SRCDIR)/Main.cpp        \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
-     -D__STDC_LIMIT_MACROS           \
-
-LOCAL_LDLIBS :=         \
-    -llog               \
-
-include $(BUILD_SHARED_LIBRARY)

Android/jni/Plugin-Input/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Plugin-RspHle/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="emu.project64.plugin_rsphle" />

Android/jni/Plugin-RspHle/PluginRSP.mk

@@ -1,32 +0,0 @@
-######################
-# Project64-rsp-hle
-######################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./PluginRSP
-
-LOCAL_MODULE := Project64-rsp-hle
-LOCAL_ARM_MODE := arm
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_SRC_FILES :=             \
-    $(SRCDIR)/alist.cpp        \
-    $(SRCDIR)/alist_audio.cpp  \
-    $(SRCDIR)/alist_naudio.cpp \
-    $(SRCDIR)/alist_nead.cpp   \
-    $(SRCDIR)/audio.cpp        \
-    $(SRCDIR)/cicx105.cpp      \
-    $(SRCDIR)/hle.cpp          \
-    $(SRCDIR)/jpeg.cpp         \
-    $(SRCDIR)/main.cpp         \
-    $(SRCDIR)/mem.cpp          \
-    $(SRCDIR)/mp3.cpp          \
-    $(SRCDIR)/musyx.cpp        \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
-     -D__STDC_LIMIT_MACROS           \
-
-include $(BUILD_SHARED_LIBRARY)

Android/jni/Plugin-RspHle/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Project64-audio/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="emu.project64.plugin_audio" />

Android/jni/Project64-audio/Project64-audio.mk

@@ -1,33 +0,0 @@
-######################
-# Project64-audio-android
-######################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./Project64-audio
-
-LOCAL_MODULE := Project64-audio-android
-LOCAL_STATIC_LIBRARIES := common \
-    Settings                     \
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_SRC_FILES :=                 \
-    $(SRCDIR)/Driver/OpenSLES.cpp  \
-    $(SRCDIR)/Driver/SoundBase.cpp \
-    $(SRCDIR)/AudioMain.cpp        \
-    $(SRCDIR)/AudioSettings.cpp    \
-    $(SRCDIR)/trace.cpp            \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
-     -D__STDC_LIMIT_MACROS           \
-
-LOCAL_LDLIBS :=         \
-    -llog               \
-    -lOpenSLES          \
-    -latomic            \
-
-include $(BUILD_SHARED_LIBRARY)

Android/jni/Project64-audio/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Project64-bridge/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="emu.project64.project64_bridge" />

Android/jni/Project64-bridge/Project64-bridge.mk

@@ -1,40 +0,0 @@
-######################
-# Project64-bridge
-######################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./Project64-bridge
-
-LOCAL_MODULE := Project64-bridge
-LOCAL_STATIC_LIBRARIES := common  \
-      Project64-core              \
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_SRC_FILES :=                   \
-    $(SRCDIR)/JavaBridge.cpp         \
-    $(SRCDIR)/JavaRomList.cpp        \
-    $(SRCDIR)/jniBridge.cpp          \
-    $(SRCDIR)/jniBridgeSettings.cpp  \
-    $(SRCDIR)/NotificationClass.cpp  \
-    $(SRCDIR)/SyncBridge.cpp         \
-    $(SRCDIR)/UISettings.cpp         \
-
-LOCAL_CFLAGS :=         \
-    $(COMMON_CFLAGS)    \
-    -DUSE_GLES          \
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-
-LOCAL_LDLIBS :=         \
-    -llog               \
-    -latomic            \
-
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    # Use for ARM7a:
-    LOCAL_CFLAGS += -mfloat-abi=softfp
-    LOCAL_CFLAGS += -mfpu=vfp
-
-endif
-
-include $(BUILD_SHARED_LIBRARY)

Android/jni/Project64-bridge/build.gradle

@@ -0,0 +1,59 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Project64-core/AndroidManifest.xml

@@ -0,0 +1 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64.project64_core" />

Android/jni/Project64-core/CMakeLists.txt

@@ -0,0 +1,95 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+project("Project64-core")
+
+add_library(Project64-core STATIC
+    AppInit.cpp
+    logging.cpp
+    Settings.cpp
+    MemoryExceptionFilter.cpp
+    Multilanguage/Language.cpp
+    Settings/LoggingSettings.cpp
+    Settings/RecompilerSettings.cpp
+    N64System/Enhancement/Enhancement.cpp
+    N64System/Enhancement/Enhancements.cpp
+    N64System/Enhancement/EnhancementFile.cpp
+    N64System/Enhancement/EnhancementList.cpp
+    N64System/Interpreter/InterpreterCPU.cpp
+    N64System/Interpreter/InterpreterOps.cpp
+    N64System/Interpreter/InterpreterOps32.cpp
+    N64System/Mips/Audio.cpp
+    N64System/Mips/Dma.cpp
+    N64System/Mips/Disk.cpp
+    N64System/Mips/Eeprom.cpp
+    N64System/Mips/FlashRam.cpp
+    N64System/Mips/GBCart.cpp
+    N64System/Mips/MemoryVirtualMem.cpp
+    N64System/Mips/Mempak.cpp
+    N64System/Mips/OpcodeName.cpp
+    N64System/Mips/PifRam.cpp
+    N64System/Mips/Register.cpp
+    N64System/Mips/Rumblepak.cpp
+    N64System/Mips/Transferpak.cpp
+    N64System/Mips/Sram.cpp
+    N64System/Mips/SystemEvents.cpp
+    N64System/Mips/SystemTiming.cpp
+    N64System/Mips/TLB.cpp
+    N64System/Recompiler/CodeBlock.cpp
+    N64System/Recompiler/CodeSection.cpp
+    N64System/Recompiler/SectionInfo.cpp
+    N64System/Recompiler/FunctionInfo.cpp
+    N64System/Recompiler/FunctionMap.cpp
+    N64System/Recompiler/LoopAnalysis.cpp
+    N64System/Recompiler/Recompiler.cpp
+    N64System/Recompiler/RecompilerCodeLog.cpp
+    N64System/Recompiler/RecompilerMemory.cpp
+    N64System/Recompiler/RegBase.cpp
+    N64System/Recompiler/Aarch64/Aarch64RegInfo.cpp
+    N64System/Recompiler/Arm/ArmOps.cpp
+    N64System/Recompiler/Arm/ArmRecompilerOps.cpp
+    N64System/Recompiler/Arm/ArmRegInfo.cpp
+    N64System/Recompiler/x86/x86ops.cpp
+    N64System/Recompiler/x86/x86RecompilerOps.cpp
+    N64System/Recompiler/x86/x86RegInfo.cpp
+    N64System/FramePerSecond.cpp
+    N64System/N64System.cpp
+    N64System/N64Rom.cpp
+    N64System/Profiling.cpp
+    N64System/SpeedLimiter.cpp
+    N64System/SystemGlobals.cpp
+    N64System/EmulationThread.cpp
+    N64System/N64Disk.cpp
+    Plugins/AudioPlugin.cpp
+    Plugins/GFXplugin.cpp
+    Plugins/ControllerPlugin.cpp
+    Plugins/RSPPlugin.cpp
+    Plugins/PluginBase.cpp
+    Plugins/Plugin.cpp
+    RomList/RomList.cpp
+    Settings/SettingType/SettingsType-Application.cpp
+    Settings/SettingType/SettingsType-ApplicationIndex.cpp
+    Settings/SettingType/SettingsType-ApplicationPath.cpp
+    Settings/SettingType/SettingsType-GameSetting.cpp
+    Settings/SettingType/SettingsType-GameSettingIndex.cpp
+    Settings/SettingType/SettingsType-RelativePath.cpp
+    Settings/SettingType/SettingsType-RDBCpuType.cpp
+    Settings/SettingType/SettingsType-RDBOnOff.cpp
+    Settings/SettingType/SettingsType-RDBRamSize.cpp
+    Settings/SettingType/SettingsType-RDBSaveChip.cpp
+    Settings/SettingType/SettingsType-RDBYesNo.cpp
+    Settings/SettingType/SettingsType-RomDatabase.cpp
+    Settings/SettingType/SettingsType-RomDatabaseIndex.cpp
+    Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
+    Settings/SettingType/SettingsType-SelectedDirectory.cpp
+    Settings/SettingType/SettingsType-TempBool.cpp
+    Settings/SettingType/SettingsType-TempNumber.cpp
+    Settings/SettingType/SettingsType-TempString.cpp
+    Settings/DebugSettings.cpp
+    Settings/GameSettings.cpp
+    Settings/N64SystemSettings.cpp)
+
+add_definitions(-DANDROID)
+
+target_link_libraries(Project64-core)

Android/jni/Project64-core/Project64-core.mk

@@ -1,116 +0,0 @@
-#########################
-# project64-core
-#########################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./Project64-core
-
-LOCAL_MODULE := Project64-core
-LOCAL_ARM_MODE := arm
-LOCAL_STATIC_LIBRARIES := common   \
-                          zlib     \
-
-LOCAL_C_INCLUDES := ../     \
-    ../3rdParty/            \
-
-               
-LOCAL_SRC_FILES :=                                                     \
-    $(SRCDIR)/AppInit.cpp                                              \
-    $(SRCDIR)/logging.cpp                                              \
-    $(SRCDIR)/Settings.cpp                                             \
-    $(SRCDIR)/MemoryExceptionFilter.cpp                                \
-    $(SRCDIR)/Multilanguage/LanguageClass.cpp                          \
-    $(SRCDIR)/Settings/LoggingSettings.cpp                             \
-    $(SRCDIR)/Settings/RecompilerSettings.cpp                          \
-    $(SRCDIR)/N64System/Interpreter/InterpreterCPU.cpp                 \
-    $(SRCDIR)/N64System/Interpreter/InterpreterOps.cpp                 \
-    $(SRCDIR)/N64System/Interpreter/InterpreterOps32.cpp               \
-    $(SRCDIR)/N64System/Mips/Audio.cpp                                 \
-    $(SRCDIR)/N64System/Mips/Dma.cpp                                   \
-    $(SRCDIR)/N64System/Mips/Disk.cpp                                  \
-    $(SRCDIR)/N64System/Mips/Eeprom.cpp                                \
-    $(SRCDIR)/N64System/Mips/FlashRam.cpp                              \
-    $(SRCDIR)/N64System/Mips/GBCart.cpp                                \
-    $(SRCDIR)/N64System/Mips/MemoryVirtualMem.cpp                      \
-    $(SRCDIR)/N64System/Mips/Mempak.cpp                                \
-    $(SRCDIR)/N64System/Mips/OpcodeName.cpp                            \
-    $(SRCDIR)/N64System/Mips/PifRam.cpp                                \
-    $(SRCDIR)/N64System/Mips/RegisterClass.cpp                         \
-    $(SRCDIR)/N64System/Mips/Rumblepak.cpp                             \
-    $(SRCDIR)/N64System/Mips/Transferpak.cpp                           \
-    $(SRCDIR)/N64System/Mips/Sram.cpp                                  \
-    $(SRCDIR)/N64System/Mips/SystemEvents.cpp                          \
-    $(SRCDIR)/N64System/Mips/SystemTiming.cpp                          \
-    $(SRCDIR)/N64System/Mips/TLBclass.cpp                              \
-    $(SRCDIR)/N64System/Recompiler/CodeBlock.cpp                       \
-    $(SRCDIR)/N64System/Recompiler/CodeSection.cpp                     \
-    $(SRCDIR)/N64System/Recompiler/SectionInfo.cpp                     \
-    $(SRCDIR)/N64System/Recompiler/FunctionInfo.cpp                    \
-    $(SRCDIR)/N64System/Recompiler/FunctionMapClass.cpp                \
-    $(SRCDIR)/N64System/Recompiler/LoopAnalysis.cpp                    \
-    $(SRCDIR)/N64System/Recompiler/RecompilerClass.cpp                 \
-    $(SRCDIR)/N64System/Recompiler/RecompilerCodeLog.cpp               \
-    $(SRCDIR)/N64System/Recompiler/RecompilerMemory.cpp                \
-    $(SRCDIR)/N64System/Recompiler/RegBase.cpp                         \
-    $(SRCDIR)/N64System/Recompiler/Arm/ArmOps.cpp                      \
-    $(SRCDIR)/N64System/Recompiler/Arm/ArmRecompilerOps.cpp            \
-    $(SRCDIR)/N64System/Recompiler/Arm/ArmRegInfo.cpp                  \
-    $(SRCDIR)/N64System/Recompiler/x86/x86ops.cpp                      \
-    $(SRCDIR)/N64System/Recompiler/x86/x86RecompilerOps.cpp            \
-    $(SRCDIR)/N64System/Recompiler/x86/x86RegInfo.cpp                  \
-    $(SRCDIR)/N64System/CheatClass.cpp                                 \
-    $(SRCDIR)/N64System/FramePerSecondClass.cpp                        \
-    $(SRCDIR)/N64System/N64Class.cpp                                   \
-    $(SRCDIR)/N64System/N64RomClass.cpp                                \
-    $(SRCDIR)/N64System/ProfilingClass.cpp                             \
-    $(SRCDIR)/N64System/SpeedLimiterClass.cpp                          \
-    $(SRCDIR)/N64System/SystemGlobals.cpp                              \
-    $(SRCDIR)/N64System/EmulationThread.cpp                            \
-    $(SRCDIR)/N64System/N64DiskClass.cpp                               \
-    $(SRCDIR)/Plugins/AudioPlugin.cpp                                  \
-    $(SRCDIR)/Plugins/GFXplugin.cpp                                    \
-    $(SRCDIR)/Plugins/ControllerPlugin.cpp                             \
-    $(SRCDIR)/Plugins/RSPPlugin.cpp                                    \
-    $(SRCDIR)/Plugins/PluginBase.cpp                                   \
-    $(SRCDIR)/Plugins/PluginClass.cpp                                  \
-    $(SRCDIR)/RomList/RomList.cpp                                      \
-    $(SRCDIR)/Settings/SettingType/SettingsType-Application.cpp        \
-    $(SRCDIR)/Settings/SettingType/SettingsType-ApplicationIndex.cpp   \
-    $(SRCDIR)/Settings/SettingType/SettingsType-ApplicationPath.cpp    \
-    $(SRCDIR)/Settings/SettingType/SettingsType-Cheats.cpp             \
-    $(SRCDIR)/Settings/SettingType/SettingsType-Enhancements.cpp       \
-    $(SRCDIR)/Settings/SettingType/SettingsType-GameSetting.cpp        \
-    $(SRCDIR)/Settings/SettingType/SettingsType-GameSettingIndex.cpp   \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RelativePath.cpp       \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RDBCpuType.cpp         \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RDBOnOff.cpp           \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RDBRamSize.cpp         \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RDBSaveChip.cpp        \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RDBYesNo.cpp           \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabase.cpp        \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp   \
-    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp \
-    $(SRCDIR)/Settings/SettingType/SettingsType-SelectedDirectory.cpp  \
-    $(SRCDIR)/Settings/SettingType/SettingsType-TempBool.cpp           \
-    $(SRCDIR)/Settings/SettingType/SettingsType-TempNumber.cpp         \
-    $(SRCDIR)/Settings/SettingType/SettingsType-TempString.cpp         \
-    $(SRCDIR)/Settings/DebugSettings.cpp                               \
-    $(SRCDIR)/Settings/GameSettings.cpp                                \
-    $(SRCDIR)/Settings/N64SystemSettings.cpp                           \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    # Use for ARM7a:
-    LOCAL_SRC_FILES += $(SRCDIR)/N64System/Recompiler/Arm/asm_functions.S
-    LOCAL_CFLAGS += -mfloat-abi=softfp
-    LOCAL_CFLAGS += -mfpu=vfp
-
-else ifeq ($(TARGET_ARCH_ABI), armeabi)
-    # Use for ARM7a:
-    LOCAL_SRC_FILES += $(SRCDIR)/N64System/Recompiler/Arm/asm_functions.S
-
-endif
-
-include $(BUILD_STATIC_LIBRARY)

Android/jni/Project64-core/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+

Android/jni/Settings/AndroidManifest.xml

@@ -0,0 +1 @@
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64.settings" />

Android/jni/Settings/Settings.mk

@@ -1,18 +0,0 @@
-#########################
-# Settings
-#########################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./Settings
-
-LOCAL_MODULE := Settings
-
-LOCAL_C_INCLUDES := ../     \
-               
-LOCAL_SRC_FILES := \
-    $(SRCDIR)/Settings.cpp        \
-
-LOCAL_CFLAGS := $(COMMON_CFLAGS)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-
-include $(BUILD_STATIC_LIBRARY)

Android/jni/Settings/build.gradle

@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply from: '../../config/version.gradle'
+
+android {
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+        debug {
+            minifyEnabled true
+            jniDebuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                debugSymbolLevel 'FULL'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.10.2"
+            path "CMakeLists.txt"
+        }
+    }
+
+    defaultConfig {
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID=1", "-DCMAKE_BUILD_TYPE=Release", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
+                cppFlags "-fexceptions", "-ffast-math", "-ftree-vectorize"
+                cFlags "-ffast-math", "-ftree-vectorize"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+
+    packagingOptions {
+        exclude 'lib/x86/libc++_shared.so'
+        exclude 'lib/x86_64/libc++_shared.so'
+        exclude 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'lib/arm64-v8a/libc++_shared.so'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+