diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6c3bae435..ccd6b2f17 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,28 +16,82 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/checkout@v2 - with: - repository: PojavLauncherTeam/gl4es - path: gl4es - - name: set up JDK 1.8 uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Get gl4es + uses: actions/checkout@v2 + with: + repository: 'ptitSeb/gl4es' + path: 'gl4es' + - name: Build latest GL4ES continue-on-error: true run: | cd gl4es - git remote add upstream https://github.com/ptitSeb/gl4es - git fetch upstream - git checkout master - git merge upstream/main || echo "Merge exit code $?" - export ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk-bundle" + mv ../Android_gl4es.mk Android.mk $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1 cp -R libs/* ../app_pojavlauncher/src/main/jniLibs/ - + + - name: Get jre8-aarch32 + uses: dawidd6/action-download-artifact@v2 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + workflow: build.yml + path: jre + workflow_conclusion: success + repo: PojavLauncherTeam/android-openjdk-build-multiarch + name: jre8-aarch32 + + - name: Get jre8-aarch64 + uses: dawidd6/action-download-artifact@v2 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + workflow: build.yml + path: jre + workflow_conclusion: success + repo: PojavLauncherTeam/android-openjdk-build-multiarch + name: jre8-aarch64 + + - name: Get jre8-x86 + uses: dawidd6/action-download-artifact@v2 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + workflow: build.yml + path: jre + workflow_conclusion: success + repo: PojavLauncherTeam/android-openjdk-build-multiarch + name: jre8-x86 + + - name: Get jre8-x86_64 + uses: dawidd6/action-download-artifact@v2 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + workflow: build.yml + path: jre + workflow_conclusion: success + repo: PojavLauncherTeam/android-openjdk-build-multiarch + name: jre8-x86_64 + + - name: Repack JRE + run: | + cd jre + mkdir work + mkdir work1 + cd work + jrepath=$GITHUB_WORKSPACE/app_pojavlauncher/src/main/assets/components/jre + mkdir -p $jrepath + work=$GITHUB_WORKSPACE/jre/work + work1=$GITHUB_WORKSPACE/jre/work1 + makearch () { echo "Making $2..."; cd $work; tar xf $(ls ../jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz $jrepath/; rm -rf $work/*; rm -rf $work1/*; } + makeuni () { echo "Making universal..."; cd $work; tar xf $(ls ../jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz $jrepath/; rm -rf $work/*; } + makeuni + makearch aarch32 arm + makearch aarch64 arm64 + makearch i386 x86 + makearch amd64 x86_64 - name: Build APK with Gradle run: | chmod +x scripts/languagelist_updater.sh diff --git a/Android_gl4es.mk b/Android_gl4es.mk new file mode 100644 index 000000000..29c1721bc --- /dev/null +++ b/Android_gl4es.mk @@ -0,0 +1,109 @@ +LOCAL_PATH := $(call my-dir) + +########################### +# +# GL static library +# +########################### + +include $(CLEAR_VARS) + +# LOCAL_MODULE := GL +LOCAL_MODULE := gl4es_115 + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) -DBCMHOST + +LOCAL_SRC_FILES := \ + src/gl/arbconverter.c \ + src/gl/arbgenerator.c \ + src/gl/arbhelper.c \ + src/gl/arbparser.c \ + src/gl/array.c \ + src/gl/blend.c \ + src/gl/blit.c \ + src/gl/buffers.c \ + src/gl/build_info.c \ + src/gl/debug.c \ + src/gl/decompress.c \ + src/gl/depth.c \ + src/gl/directstate.c \ + src/gl/drawing.c \ + src/gl/enable.c \ + src/gl/envvars.c \ + src/gl/eval.c \ + src/gl/face.c \ + src/gl/fog.c \ + src/gl/fpe.c \ + src/gl/fpe_cache.c \ + src/gl/fpe_shader.c \ + src/gl/framebuffers.c \ + src/gl/gl_lookup.c \ + src/gl/getter.c \ + src/gl/gl4es.c \ + src/gl/glstate.c \ + src/gl/hint.c \ + src/gl/init.c \ + src/gl/light.c \ + src/gl/line.c \ + src/gl/list.c \ + src/gl/listdraw.c \ + src/gl/listrl.c \ + src/gl/loader.c \ + src/gl/logs.c \ + src/gl/matrix.c \ + src/gl/matvec.c \ + src/gl/oldprogram.c \ + src/gl/pixel.c \ + src/gl/planes.c \ + src/gl/pointsprite.c \ + src/gl/preproc.c \ + src/gl/program.c \ + src/gl/queries.c \ + src/gl/raster.c \ + src/gl/render.c \ + src/gl/samplers.c \ + src/gl/shader.c \ + src/gl/shaderconv.c \ + src/gl/shader_hacks.c \ + src/gl/stack.c \ + src/gl/stencil.c \ + src/gl/string_utils.c \ + src/gl/stubs.c \ + src/gl/texenv.c \ + src/gl/texgen.c \ + src/gl/texture.c \ + src/gl/texture_compressed.c \ + src/gl/texture_params.c \ + src/gl/texture_read.c \ + src/gl/texture_3d.c \ + src/gl/uniform.c \ + src/gl/vertexattrib.c \ + src/gl/wrap/gl4eswraps.c \ + src/gl/wrap/gles.c \ + src/gl/wrap/glstub.c \ + src/gl/math/matheval.c \ + src/glx/hardext.c \ + src/glx/glx.c \ + src/glx/lookup.c \ + src/glx/gbm.c \ + src/glx/streaming.c \ + +LOCAL_CFLAGS += -g -std=gnu99 -funwind-tables -O3 -fvisibility=hidden -include include/android_debug.h +LOCAL_CFLAGS += -DNOX11 +LOCAL_CFLAGS += -DNO_GBM +#LOCAL_CFLAGS += -DNO_INIT_CONSTRUCTOR +LOCAL_CFLAGS += -DDEFAULT_ES=2 + +LOCAL_LDLIBS := -llog + +ifeq ($(NDK_DEBUG),1) + cmd-strip := +endif + +#building as a static lib + +# LOCAL_CFLAGS += -DSTATICLIB +# include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) diff --git a/README.md b/README.md index 536605238..d25d13a46 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Discord](https://img.shields.io/discord/724163890803638273.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/6RpEJda) [![Reddit](https://img.shields.io/badge/dynamic/json.svg?label=r/PojavLauncher%20member%20count&query=$.data.subscribers&url=https://www.reddit.com/r/PojavLauncher/about.json)](https://reddit.com/r/PojavLauncher) [![Google Play](https://gist.githubusercontent.com/meefik/54a54afa7cc1dc600bdb855cb7895a4a/raw/ad617c006a1ac28d067c9a87cec60199ca8fef7c/get-it-on-google-play.png)](https://play.google.com/store/apps/details?id=net.kdt.pojavlaunch) + # PojavLauncher ## Note diff --git a/app_pojavlauncher/src/main/assets/components/jre/bin-arm.tar.xz b/app_pojavlauncher/src/main/assets/components/jre/bin-arm.tar.xz deleted file mode 100644 index c7b8095e6..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/jre/bin-arm.tar.xz and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/jre/bin-arm64.tar.xz b/app_pojavlauncher/src/main/assets/components/jre/bin-arm64.tar.xz deleted file mode 100644 index 083551acf..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/jre/bin-arm64.tar.xz and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/jre/bin-x86.tar.xz b/app_pojavlauncher/src/main/assets/components/jre/bin-x86.tar.xz deleted file mode 100644 index 673ae90b3..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/jre/bin-x86.tar.xz and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/jre/bin-x86_64.tar.xz b/app_pojavlauncher/src/main/assets/components/jre/bin-x86_64.tar.xz deleted file mode 100644 index 53574d492..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/jre/bin-x86_64.tar.xz and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/jre/universal.tar.xz b/app_pojavlauncher/src/main/assets/components/jre/universal.tar.xz deleted file mode 100644 index e2897df76..000000000 Binary files a/app_pojavlauncher/src/main/assets/components/jre/universal.tar.xz and /dev/null differ diff --git a/app_pojavlauncher/src/main/assets/components/jre/version b/app_pojavlauncher/src/main/assets/components/jre/version index 168782f3f..94c7da9c4 100644 --- a/app_pojavlauncher/src/main/assets/components/jre/version +++ b/app_pojavlauncher/src/main/assets/components/jre/version @@ -1 +1 @@ -20210321 +20210418