diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml index 20b9c0919d..0ae346f761 100644 --- a/metadata/org.blokada.fem.fdroid.yml +++ b/metadata/org.blokada.fem.fdroid.yml @@ -396,37 +396,9 @@ Builds: - ./build.blocka.sh ndk: r21e - - versionName: 5.20.1 - versionCode: 520000001 - disable: ndk r24 - commit: 28f8d19e3a0431e54201e030b2ca558d5e5b44c1 - subdir: android5/app - submodules: true - gradle: - - droid - srclibs: - - rustup@1.23.1 - rm: - - android5/app/src/engine/jniLibs - prebuild: - - unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist - -d src/main/assets - - rm src/main/assets/default_blocklist.zip - build: - - $$rustup$$/rustup-init.sh -y - - source $HOME/.cargo/env - - rustup default stable - - rustup target add armv7-linux-androideabi - - rustup target add aarch64-linux-android - - cargo install cargo-ndk --version 1.0.0 - - export ANDROID_NDK=$$NDK$$ - - cd ../.. - - ./build.boringtun.sh - - ./build.blocka.sh - ndk: r24 - - versionName: 5.20.2 versionCode: 520000002 + disable: ndk r24 commit: 67ab20824d120dc912406c8bb427c1c5db1e26b6 subdir: android5/app submodules: true diff --git a/metadata/rocks.tbog.tblauncher.yml b/metadata/rocks.tbog.tblauncher.yml index a82b049480..80f810b93f 100644 --- a/metadata/rocks.tbog.tblauncher.yml +++ b/metadata/rocks.tbog.tblauncher.yml @@ -142,6 +142,10 @@ Builds: versionCode: 32 commit: cfa59dc55f89868ac37e45abdb11ab0ac3be4689 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes