diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4e4ecffc0..476b485b6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,6 +22,12 @@ jobs: with: submodules: "recursive" + - name: Update glslang sources + if: github.ref_name == 'feat/MobileGL' || github.head_ref == 'feat/MobileGL' + run: | + cd MobileGL/3rdparty/glslang + ./update_glslang_sources.py + - name: Set up JDK 21 uses: actions/setup-java@v3 with: diff --git a/.gitmodules b/.gitmodules index 912b8fdd3..5a412efad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "sdl2-compat"] path = app_pojavlauncher/src/main/jni/sdl2-compat url = https://github.com/libsdl-org/sdl2-compat.git +[submodule "MobileGL"] + path = MobileGL + url = https://github.com/MobileGL-Dev/MobileGL.git diff --git a/MobileGL b/MobileGL new file mode 160000 index 000000000..fc4cd980f --- /dev/null +++ b/MobileGL @@ -0,0 +1 @@ +Subproject commit fc4cd980f2b2a4a16cbe1834d53a2ea658db5ea9 diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index e4384d5e6..5ecdbcb3a 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -242,4 +242,5 @@ dependencies { implementation "net.java.dev.jna:jna:5.14.0@aar" + implementation project(':MobileGL') } diff --git a/app_pojavlauncher/libs/MobileGL-release.aar b/app_pojavlauncher/libs/MobileGL-release.aar deleted file mode 100644 index 798855902..000000000 Binary files a/app_pojavlauncher/libs/MobileGL-release.aar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 457600996..3da12eb78 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,3 +23,4 @@ include ':app_pojavlauncher' include ':arc_dns_injector' include ':methods_injector_agent' include ':forge_installer' +include ':MobileGL'