QuestCraft BigTinyWrapper (#58)

Co-authored-by: The Judge <[email protected]>
QuestCraftPlusPlus · Sep 7, 2024 · 12914cc · 12914cc
1 parent 97e8432
commit 12914cc
Show file tree

Hide file tree

Showing 30 changed files with 67 additions and 50,134 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,5 +5,3 @@
 # These are Windows script files and should use crlf
 *.bat           text eol=crlf
 *.so filter=lfs diff=lfs merge=lfs -text
-*.so !text !filter !merge !diff
-* !text !filter !merge !diff
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -53,3 +53,9 @@ jobs:
       env:
         QCXR_KEYSTORE_ALIAS: ${{ secrets.QCXR_KEYSTORE_ALIAS }}
         QCXR_KEYSTORE_PASS: ${{ secrets.QCXR_KEYSTORE_PASS }}
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v3
+      with:
+          name: app-debug
+          path: build/outputs/aar/*
diff --git a/src/main/java/pojlib/util/JREUtils.java b/src/main/java/pojlib/util/JREUtils.java
@@ -200,6 +200,8 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
         userArgs.add("-XX:+ZGenerational");
         userArgs.add("-XX:+UnlockExperimentalVMOptions");
         userArgs.add("-XX:+AllowUserSignalHandlers");
+        userArgs.add("-XX:+UnlockDiagnosticVMOptions");
+        userArgs.add("-XX:-ImplicitNullChecks");
         userArgs.add("-XX:+DisableExplicitGC");
         userArgs.add("-XX:+UseCriticalJavaThreadPriority");
 

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
@@ -7,30 +7,6 @@ HERE_PATH := $(LOCAL_PATH)
 
 LOCAL_PATH := $(HERE_PATH)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := regal
-LOCAL_SRC_FILES := GL/libRegal.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := spirv-cross
-LOCAL_SRC_FILES := tinywrapper/SPIRVCross/libspirv-cross-c-shared.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := shaderc
-LOCAL_SRC_FILES := tinywrapper/shaderc/libshaderc_shared.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := tinywrapper
-LOCAL_SHARED_LIBRARIES := regal spirv-cross shaderc
-LOCAL_LDLIBS := -lGLESv3
-LOCAL_SRC_FILES := tinywrapper/main.c tinywrapper/string_utils.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/tinywrapper
-include $(BUILD_SHARED_LIBRARY)
-
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := openxr_loader
 LOCAL_SRC_FILES := libopenxr_loader.so
@@ -69,7 +45,7 @@ LOCAL_LDLIBS := -ldl -llog -landroid -lGLESv3 -lEGL
 # -lGLESv2
 LOCAL_MODULE := pojavexec
 # LOCAL_CFLAGS += -DDEBUG
-LOCAL_SHARED_LIBRARIES := openvr_api regal
+LOCAL_SHARED_LIBRARIES := openvr_api
 # -DGLES_TEST
 LOCAL_SRC_FILES := \
     egl_bridge.c \