From f9d95734f77056e96d540693ece036e61ff5c5e1 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Thu, 13 Oct 2022 09:08:18 +0000 Subject: [PATCH] Optimize ch.protonvpn.android build recipe --- metadata/ch.protonvpn.android.yml | 6 +++--- srclibs/android-ndk-boringssl.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 srclibs/android-ndk-boringssl.yml diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml index 94843b8b87..19026d55f5 100644 --- a/metadata/ch.protonvpn.android.yml +++ b/metadata/ch.protonvpn.android.yml @@ -1186,7 +1186,8 @@ Builds: libldap2-dev gperf bison bzip2 flex swig gradle: - prod - output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk + srclibs: + - android-ndk-boringssl@ndk-static rm: - app/src/main/jniLibs/x86/* - app/src/main/jniLibs/x86_64/* @@ -1200,8 +1201,7 @@ Builds: - sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle - git submodule update --init --recursive ../strongswan - cd ../strongswan - - git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static - src/frontends/android/app/src/main/jni/openssl + - ln -s -T $$android-ndk-boringssl$$ src/frontends/android/app/src/main/jni/openssl - cd .. - echo ndk.dir="$(pwd)"/ndk/android-ndk-r21e > strongswan/src/frontends/android/local.properties scandelete: diff --git a/srclibs/android-ndk-boringssl.yml b/srclibs/android-ndk-boringssl.yml new file mode 100644 index 0000000000..d649a99dbb --- /dev/null +++ b/srclibs/android-ndk-boringssl.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: git://git.strongswan.org/android-ndk-boringssl.git