implement enough to launch 2.2 (#2)

* generic maintenance and allow armv8

* implement missing java functions

* Update build.yml

* add missing audiodevice code

* split apk support

* ignore (gitignore)

* replace library load with native code

* set supported abis again

---------

Co-authored-by: alk <45172705+altalk23@users.noreply.github.com>

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build launcher
 on:
   workflow_dispatch:
   push:
-    branches: ["main"]
+    branches: '*'
 
 jobs:
   build:

.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea/*
 .DS_Store
 /build
 /captures

app/build.gradle

@@ -9,7 +9,7 @@ android {
     defaultConfig {
         applicationId "com.geode.launcher"
         minSdk 23
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "0.6.0-alpha.1"
 
@@ -21,8 +21,8 @@ android {
                 arguments "-DDOBBY_DEBUG=OFF"
             }
         }
-        // support only armv7 as GD only supports armv7
-        ndkConfig.abiFilters "armeabi-v7a"
+
+        ndkConfig.abiFilters "arm64-v8a", "armeabi-v7a"
     }
 
     buildTypes {
@@ -62,14 +62,13 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.1.1'
+    implementation 'androidx.compose.material3:material3:1.1.2'
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
-    implementation 'androidx.activity:activity-compose:1.7.2'
-    implementation 'androidx.activity:activity-ktx:1.7.2'
+    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.activity:activity-ktx:1.8.2'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation files('../libs/fmod.jar')
+    implementation 'com.google.android.material:material:1.11.0'
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 }

app/src/main/cpp/CMakeLists.txt

@@ -22,4 +22,6 @@ if(NOT dobby_POPULATED)
     add_subdirectory("${dobby_SOURCE_DIR}" ${dobby_BINARY_DIR} EXCLUDE_FROM_ALL)
     target_include_directories(launcherfix PRIVATE ${dobby_SOURCE_DIR}/include)
     target_link_libraries(launcherfix dobby)
-endif()
+endif()
+
+target_link_libraries(launcherfix log)

app/src/main/cpp/launcher-fix.cpp

@@ -1,7 +1,13 @@
+#include <android/dlext.h>
+#include <android/log.h>
 #include <dlfcn.h>
+#include <jni.h>
 #include <string>
+#include <unistd.h>
+
+#ifndef DISABLE_LAUNCHER_FIX
 #include <dobby.h>
-#include <jni.h>
+#endif
 
 class DataPaths {
 public:
@@ -27,6 +33,8 @@ JNIEXPORT void JNICALL Java_com_geode_launcher_LauncherFix_setDataPath(
     auto data_path_str = env->GetStringUTFChars(data_path, &is_copy);
 
     DataPaths::get_instance().data_path = std::string(data_path_str);
+
+    env->ReleaseStringUTFChars(data_path, data_path_str);
 }
 
 extern "C"
@@ -39,6 +47,38 @@ JNIEXPORT void JNICALL Java_com_geode_launcher_LauncherFix_setOriginalDataPath(
     auto data_path_str = env->GetStringUTFChars(data_path, &is_copy);
 
     DataPaths::get_instance().original_data_path = std::string(data_path_str);
+
+    env->ReleaseStringUTFChars(data_path, data_path_str);
+}
+
+extern "C"
+JNIEXPORT jboolean JNICALL Java_com_geode_launcher_LauncherFix_loadLibraryFromOffset(JNIEnv *env, jobject, jstring library_name, jint fd, jlong offset) {
+    // loads a given library at an offset and file descriptor
+    // assumes we have ownership of the file passed in fd
+
+    auto is_copy = jboolean();
+    auto library_cname = env->GetStringUTFChars(library_name, &is_copy);
+
+    android_dlextinfo ext_info{};
+    ext_info.flags = ANDROID_DLEXT_USE_LIBRARY_FD | ANDROID_DLEXT_USE_LIBRARY_FD_OFFSET;
+    ext_info.library_fd = fd;
+    ext_info.library_fd_offset = offset;
+
+    auto handle = android_dlopen_ext(library_cname, RTLD_NOW | RTLD_GLOBAL, &ext_info);
+    env->ReleaseStringUTFChars(library_name, library_cname);
+    close(fd);
+
+    if (handle == nullptr) {
+        auto error = dlerror();
+        __android_log_print(ANDROID_LOG_WARN, "GeodeLauncher-Fix", "dlopen_ext failed. given: %s\n", error);
+
+        return false;
+    }
+
+    // we don't need the library anymore
+    dlclose(handle);
+
+    return true;
 }
 
 FILE* (*fopen_original)(const char *pathname, const char *mode);
@@ -60,11 +100,13 @@ FILE* fopen_hook(const char* pathname, const char* mode) {
 }
 
 [[gnu::constructor]] [[gnu::used]] void setup_hooks() {
+    #ifndef DISABLE_LAUNCHER_FIX
     auto fopen_addr = dlsym(RTLD_NEXT, "fopen");
 
     DobbyHook(
         fopen_addr,
         reinterpret_cast<dobby_dummy_func_t>(&fopen_hook),
         reinterpret_cast<dobby_dummy_func_t*>(&fopen_original)
     );
+    #endif
 }