Update NDK, Gradle and dependencies + Improve Settings API + Migrate …

…to PugiXML

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "app/libraries/tinyxml2"]
-	path = app/libraries/tinyxml2
-	url = https://github.com/leethomason/tinyxml2
 [submodule "app/libraries/fmt"]
 	path = app/libraries/fmt
 	url = https://github.com/fmtlib/fmt
@@ -17,3 +14,6 @@
 [submodule "app/libraries/frozen"]
 	path = app/libraries/frozen
 	url = https://github.com/serge-sans-paille/frozen
+[submodule "app/libraries/pugixml"]
+	path = app/libraries/pugixml
+	url = https://github.com/zeux/pugixml.git

app/CMakeLists.txt

@@ -1,30 +1,33 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 project(Skyline LANGUAGES CXX ASM VERSION 0.3)
 
-set(BUILD_TESTS OFF)
-set(BUILD_TESTING OFF)
+set(BUILD_TESTS OFF CACHE BOOL "Build Tests" FORCE)
+set(BUILD_TESTING OFF CACHE BOOL "Build Testing" FORCE)
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 set(source_DIR ${CMAKE_SOURCE_DIR}/src/main/cpp)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -flto=full -fno-stack-protector -Wno-unused-command-line-argument")
 if (uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")
     add_compile_definitions(NDEBUG)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif ()
 
-set(CMAKE_POLICY_DEFAULT_CMP0048 OLD)
-add_subdirectory("libraries/tinyxml2")
 add_subdirectory("libraries/fmt")
+
 add_subdirectory("libraries/oboe")
-add_subdirectory("libraries/lz4/contrib/cmake_unofficial")
-include_directories("libraries/lz4/lib")
 include_directories("libraries/oboe/include")
+
+set(LZ4_BUILD_CLI OFF CACHE BOOL "Build LZ4 CLI" FORCE)
+add_subdirectory("libraries/lz4/build/cmake")
+include_directories("libraries/lz4/lib")
+
 include_directories("libraries/vkhpp/include")
+include_directories("libraries/pugixml/src") # We use PugiXML in header-only mode
 include_directories("libraries/frozen/include")
-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
 
 find_package(mbedtls REQUIRED CONFIG)
 
@@ -163,7 +166,5 @@ add_library(skyline SHARED
         ${source_DIR}/skyline/services/ssl/ISslContext.cpp
         ${source_DIR}/skyline/services/prepo/IPrepoService.cpp
         )
-
-target_link_libraries(skyline vulkan android fmt tinyxml2 oboe lz4_static mbedtls::mbedcrypto)
-set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=c++2a")
-target_compile_options(skyline PRIVATE -Wno-c++17-extensions -Wall -Wno-reorder -Wno-missing-braces -Wno-unused-variable -Wno-unused-private-field)
+target_link_libraries(skyline vulkan android fmt lz4_static oboe mbedtls::mbedcrypto)
+target_compile_options(skyline PRIVATE -Wall -Wno-unknown-attributes -Wno-c++20-extensions -Wno-c++17-extensions -Wno-c99-designator -Wno-reorder -Wno-missing-braces -Wno-unused-variable -Wno-unused-private-field)

app/build.gradle

@@ -4,23 +4,32 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "skyline.emu"
+
         minSdkVersion 26
         targetSdkVersion 30
+
         versionCode 3
         versionName "0.3"
+
         ndk {
             abiFilters "arm64-v8a"
         }
     }
-    lintOptions {
-        disable 'IconLocation'
+
+    /* JVM Bytecode Options */
+    def javaVersion = JavaVersion.VERSION_11
+    compileOptions {
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = javaVersion.toString()
     }
+
+    /* Build Options */
     buildTypes {
         release {
             debuggable true
@@ -34,43 +43,57 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
+
         debug {
             debuggable true
             minifyEnabled false
             shrinkResources false
         }
     }
+    buildFeatures {
+        prefab true
+        viewBinding false
+    }
+
+    /* Android Extensions */
     androidExtensions {
+        /* TODO: Remove this after migrating to View Bindings */
         experimental = true
     }
+
+    /* Linting */
+    lintOptions {
+        disable 'IconLocation'
+    }
+
+    /* NDK */
+    ndkVersion '22.0.7026061'
     externalNativeBuild {
         cmake {
-            version "3.10.2+"
+            version '3.18.1+'
             path "CMakeLists.txt"
         }
     }
-    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
-    ndkVersion '21.3.6528147'
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    /* Filetrees */
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+
+    /* Google  */
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
-    implementation "androidx.core:core-ktx:1.3.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.google.android.material:material:1.3.0-rc01'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'info.debatty:java-string-similarity:1.2.1'
-    implementation(name: 'mbedtls', ext: 'aar')
-}
-repositories {
-    mavenCentral()
-    flatDir {
-        dirs 'libraries'
-    }
+
+    /* Kotlin */
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    /* Other Java */
+    implementation 'info.debatty:java-string-similarity:2.0.0'
+
+    /* NDK */
+    implementation files("libraries/mbedtls.aar")
 }

app/src/main/AndroidManifest.xml

@@ -12,9 +12,10 @@
     <application
             android:name=".SkylineApplication"
             android:allowBackup="true"
-            android:extractNativeLibs="true"
+            android:extractNativeLibs="false"
             android:fullBackupContent="@xml/backup_descriptor"
             android:icon="@drawable/logo_skyline"
+            android:isGame="true"
             android:label="@string/app_name"
             android:supportsRtl="true"
             android:theme="@style/AppTheme"

app/src/main/cpp/emu_jni.cpp

@@ -32,8 +32,7 @@ extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication(
     close(preferenceFd);
 
     auto appFilesPath{env->GetStringUTFChars(appFilesPathJstring, nullptr)};
-    auto logger{std::make_shared<skyline::Logger>(std::string(appFilesPath) + "skyline.log", static_cast<skyline::Logger::LogLevel>(std::stoi(settings->GetString("log_level"))))};
-    //settings->List(logger); // (Uncomment when you want to print out all settings strings)
+    auto logger{std::make_shared<skyline::Logger>(std::string(appFilesPath) + "skyline.log", static_cast<skyline::Logger::LogLevel>(settings->logLevel))};
 
     auto start{std::chrono::steady_clock::now()};
 

app/src/main/cpp/skyline/common.h

@@ -8,6 +8,7 @@
 #include <span>
 #include <list>
 #include <vector>
+#include <span>
 #include <fstream>
 #include <mutex>
 #include <shared_mutex>
@@ -292,8 +293,8 @@ namespace skyline {
         using std::span<T, Extent>::span;
         using std::span<T, Extent>::operator=;
 
-        typedef typename std::span<T, Extent>::element_type elementType;
-        typedef typename std::span<T, Extent>::index_type indexType;
+        typedef typename std::span<T, Extent>::element_type element_type;
+        typedef typename std::span<T, Extent>::size_type size_type;
 
         constexpr span(const std::span<T, Extent> &spn) : std::span<T, Extent>(spn) {}
 
@@ -329,7 +330,7 @@ namespace skyline {
          * @param amount The amount of elements that need to be copied (in terms of the supplied span), 0 will try to copy the entirety of the other span
          */
         template<typename In, size_t InExtent>
-        constexpr void copy_from(const span<In, InExtent> spn, indexType amount = 0) {
+        constexpr void copy_from(const span<In, InExtent> spn, size_type amount = 0) {
             auto size{amount ? amount * sizeof(In) : spn.size_bytes()};
             if (span::size_bytes() < size)
                 throw exception("Data being copied is larger than this span");
@@ -340,7 +341,7 @@ namespace skyline {
          * @brief Implicit type conversion for copy_from, this allows passing in std::vector/std::array in directly is automatically passed by reference which is important for any containers
          */
         template<typename In>
-        constexpr void copy_from(const In &in, indexType amount = 0) {
+        constexpr void copy_from(const In &in, size_type amount = 0) {
             copy_from(span<typename std::add_const<typename In::value_type>::type>(in), amount);
         }
 
@@ -355,11 +356,11 @@ namespace skyline {
             return std::span<T, Extent>::template last<Count>();
         }
 
-        constexpr span<elementType, std::dynamic_extent> first(indexType count) const noexcept {
+        constexpr span<element_type, std::dynamic_extent> first(size_type count) const noexcept {
             return std::span<T, Extent>::first(count);
         }
 
-        constexpr span<elementType, std::dynamic_extent> last(indexType count) const noexcept {
+        constexpr span<element_type, std::dynamic_extent> last(size_type count) const noexcept {
             return std::span<T, Extent>::last(count);
         }
 
@@ -368,7 +369,7 @@ namespace skyline {
             return std::span<T, Extent>::template subspan<Offset, Count>();
         }
 
-        constexpr span<T, std::dynamic_extent> subspan(indexType offset, indexType count = std::dynamic_extent) const noexcept {
+        constexpr span<T, std::dynamic_extent> subspan(size_type offset, size_type count = std::dynamic_extent) const noexcept {
             return std::span<T, Extent>::subspan(offset, count);
         }
     };