From 66076008326c87194f88eaf13c6b9f0fa89bf447 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Sat, 23 Mar 2019 21:46:19 +0300
Subject: [PATCH] Fennec F-Droid: prepare for 66.0.1

Include ARMv8 build this time: fdroid/fdroiddata#886 seems to be fixed.
---
 metadata/org.mozilla.fennec_fdroid.txt | 108 +++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index ec339f2b9e..b64c46ceb2 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -5663,6 +5663,114 @@ Build:66.0,660010
         zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*'
     ndk=r19
 
+Build:66.0.1,660100
+    commit=FENNEC_66_0_1_RELEASE
+    timeout=28800
+    sudo=apt-get update || apt-get update && \
+        apt-get install -y g++ libgmp-dev libmpfr-dev libmpc-dev
+    output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk
+    srclibs=MozLocales@17623bb918695f15af787bc8755deb7c4608a162,rustup@1.16.0
+    prebuild=bash $$MozLocales$$/prebuild.sh && \
+        echo "ac_add_options --target=arm-linux-androideabi" >> .mozconfig && \
+        echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" >> .mozconfig && \
+        echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" >> .mozconfig && \
+        echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
+        echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
+        sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* && \
+        popd
+    build=$$rustup$$/rustup-init.sh -y && \
+        source $HOME/.cargo/env && \
+        rustup default 1.32.0 && \
+        rustup target add armv7-linux-androideabi && \
+        cargo install --force --vers 0.8.2 cbindgen && \
+        ./mach build && \
+        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/*.*'
+    ndk=r19
+
+Build:66.0.1,660110
+    commit=FENNEC_66_0_1_RELEASE
+    timeout=28800
+    sudo=apt-get update || apt-get update && \
+        apt-get install -y g++ libgmp-dev libmpfr-dev libmpc-dev
+    output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk
+    srclibs=MozLocales@17623bb918695f15af787bc8755deb7c4608a162,rustup@1.16.0
+    prebuild=bash $$MozLocales$$/prebuild.sh && \
+        echo "ac_add_options --target=i686-linux-android" >> .mozconfig && \
+        echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" >> .mozconfig && \
+        echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" >> .mozconfig && \
+        echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
+        echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
+        sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* && \
+        popd
+    build=$$rustup$$/rustup-init.sh -y && \
+        source $HOME/.cargo/env && \
+        rustup default 1.32.0 && \
+        rustup target add i686-linux-android && \
+        cargo install --force --vers 0.8.2 cbindgen && \
+        ./mach build && \
+        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/*.*'
+    ndk=r19
+
+Build:66.0.1,660120
+    commit=FENNEC_66_0_1_RELEASE
+    timeout=28800
+    sudo=apt-get update || apt-get update && \
+        apt-get install -y g++ libgmp-dev libmpfr-dev libmpc-dev
+    output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk
+    srclibs=MozLocales@17623bb918695f15af787bc8755deb7c4608a162,rustup@1.16.0
+    prebuild=bash $$MozLocales$$/prebuild.sh && \
+        echo "ac_add_options --target=aarch64-linux-android" >> .mozconfig && \
+        echo "ac_add_options --with-android-min-sdk=21" >> .mozconfig && \
+        echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
+        echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
+        echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
+        echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" >> .mozconfig && \
+        echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" >> .mozconfig && \
+        echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig && \
+        pushd mobile/android/branding/unofficial/ && \
+        sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
+        echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
+        echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
+        echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
+        sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* && \
+        popd
+    build=$$rustup$$/rustup-init.sh -y && \
+        source $HOME/.cargo/env && \
+        rustup default 1.32.0 && \
+        rustup target add aarch64-linux-android && \
+        cargo install --force --vers 0.8.2 cbindgen && \
+        ./mach build && \
+        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/*.*'
+    ndk=r19
+
 Maintainer Notes:
 
 Updating/Versioning: