diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt index 977b9b40e6..eb0e83de8d 100644 --- a/metadata/org.mozilla.fennec_fdroid.txt +++ b/metadata/org.mozilla.fennec_fdroid.txt @@ -4402,6 +4402,76 @@ Build:60.0,600010 zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*' ndk=r15c +Build:60.0.1,600100 + commit=FENNEC_60_0_1_RELEASE + timeout=21600 + sudo=apt update && \ + apt install -y g++ proguard-cli/testing libproguard-java/testing + output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs=MozLocales@20ad83b906b6c7c8b139356b62915ca32e584001 + 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 'export PROGUARD_JAR=/usr/share/java/proguard.jar'" >> .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=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \ + mkdir rust && \ + curl https://static.rust-lang.org/dist/rust-1.24.1-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \ + curl https://static.rust-lang.org/dist/rust-std-1.24.1-armv7-linux-androideabi.tar.xz | tar -x -J -C rust --strip-components 2 && \ + PATH=$PATH:$PWD/rust/bin ./mach build && \ + cat used-locales | xargs -I % ./mach build chrome-% && \ + make -C obj package AB_CD=multi && \ + zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*' + ndk=r15c + +Build:60.0.1,600110 + commit=FENNEC_60_0_1_RELEASE + timeout=21600 + sudo=apt update && \ + apt install -y g++ proguard-cli/testing libproguard-java/testing + output=obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs=MozLocales@20ad83b906b6c7c8b139356b62915ca32e584001 + prebuild=bash $$MozLocales$$/prebuild.sh && \ + echo "ac_add_options --target=i386-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 'export PROGUARD_JAR=/usr/share/java/proguard.jar'" >> .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=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \ + mkdir rust && \ + curl https://static.rust-lang.org/dist/rust-1.24.1-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \ + curl https://static.rust-lang.org/dist/rust-std-1.24.1-i686-linux-android.tar.xz | tar -x -J -C rust --strip-components 2 && \ + PATH=$PATH:$PWD/rust/bin ./mach build && \ + cat used-locales | xargs -I % ./mach build chrome-% && \ + make -C obj package AB_CD=multi && \ + zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk 'META-INF/*.*' + ndk=r15c + Maintainer Notes: Updating/Versioning: @@ -4424,5 +4494,5 @@ Reroute Feedback: Archive Policy:6 versions Auto Update Mode:None Update Check Mode:None -Current Version:60.0 -Current Version Code:600000 +Current Version:60.0.1 +Current Version Code:600110