From 156ae092f178b6bad6154ce5637b7ca74fb12bf8 Mon Sep 17 00:00:00 2001 From: relan Date: Wed, 8 Jul 2020 17:58:25 +0300 Subject: [PATCH] Fennec F-Droid: random attempt to fix 68.10.0 A random guess is that version files in META-INF break APKs publication. Use signed/aligned APKs as outputs because they have no those files. --- metadata/org.mozilla.fennec_fdroid.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index 74d4241109..8ec2e0efab 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -9856,7 +9856,7 @@ Builds: - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 - output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + output: obj/dist/fennec-$$VERSION$$.multi.android-arm.apk srclibs: - MozLocales@e6b88d980bbc157fc7903a42161dd8ccbbc84f98 - rustup@1.21.1 @@ -9904,8 +9904,8 @@ Builds: - cat used-locales | xargs -I % ./mach build chrome-% - make -C obj/mobile/android/base android_apks - make -C obj package AB_CD=multi - - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk - 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-arm.apk 'META-INF/CERT.*' + 'META-INF/MANIFEST.MF' ndk: r19c - versionName: 68.10.0 @@ -9918,7 +9918,7 @@ Builds: - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 - output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + output: obj/dist/fennec-$$VERSION$$.multi.android-i686.apk srclibs: - MozLocales@e6b88d980bbc157fc7903a42161dd8ccbbc84f98 - rustup@1.21.1 @@ -9966,8 +9966,8 @@ Builds: - cat used-locales | xargs -I % ./mach build chrome-% - make -C obj/mobile/android/base android_apks - make -C obj package AB_CD=multi - - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk - 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-i686.apk 'META-INF/CERT.*' + 'META-INF/MANIFEST.MF' ndk: r19c - versionName: 68.10.0 @@ -9980,7 +9980,7 @@ Builds: - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 - output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + output: obj/dist/fennec-$$VERSION$$.multi.android-aarch64.apk srclibs: - MozLocales@e6b88d980bbc157fc7903a42161dd8ccbbc84f98 - rustup@1.21.1 @@ -10028,8 +10028,8 @@ Builds: - cat used-locales | xargs -I % ./mach build chrome-% - make -C obj/mobile/android/base android_apks - make -C obj package AB_CD=multi - - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk - 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-aarch64.apk 'META-INF/CERT.*' + 'META-INF/MANIFEST.MF' ndk: r19c MaintainerNotes: |4-