Update Fennec FDroid to 36.0.1 (360100)

This commit is contained in:
Boris Kraut 2015-03-11 23:39:42 +01:00
parent eb6a62a2ea
commit f4c3344c9b

View file

@ -252,8 +252,7 @@ Build:36.0,360010
mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
zip -d fdroid/fennec-unsigned.apk "META-INF*"
Build:36.0.1,360011
disable=wip
Build:36.0.1,360100
commit=FENNEC_36_0_1_RELEASE
srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
output=fdroid/fennec-unsigned.apk
@ -275,7 +274,68 @@ Build:36.0.1,360011
rm -R xpcom/tests/
scanignore=mobile/android/base/JavaAddonManager.java
prebuild=mkdir fdroid && \
vercode=360011 && \
vercode=360100 && \
fxarch=arm-linux-androideabi && \
l10ndir=`readlink -f $$MozLocales$$` && \
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-21\"" >> .mozconfig && \
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
echo "ac_add_options --disable-tests" >> .mozconfig && \
echo "ac_add_options --disable-updater" >> .mozconfig && \
echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
echo "ac_add_options --disable-debug" >> .mozconfig && \
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
echo "mk_add_options 'export ANDROID_VERSION_CODE=${vercode}'" >> .mozconfig && \
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .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 FDroid"' >> configure.sh && \
popd && \
echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\nMOZ_SERVICES_HEALTHREPORT=0\n' >> mobile/android/confvars.sh && \
echo "==HOTFIX==" && \
patch -p1 <$$MozLocales$$/Bug1083116.patch && \
sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
rm -R mobile/android/gradle/ && \
sed -i -e '/gradle/d' mobile/android/moz.build
build=./mach build && \
fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
pushd obj-${fxarch}/mobile/android/locales && \
for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
popd && \
./mach package && \
mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
zip -d fdroid/fennec-unsigned.apk "META-INF*"
Build:36.0.1,360110
commit=FENNEC_36_0_1_RELEASE
srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
output=fdroid/fennec-unsigned.apk
ndk=r10d
init=\
rm -R docshell/test/ && \
rm -R dom/tests/ && \
rm -R modules/libjar/test/ && \
rm -R security/manager/ssl/tests/*test/ && \
rm -R security/nss/cmd/bltest/tests/ && \
rm -R security/nss/tests/ && \
rm toolkit/crashreporter/moz.build && \
rm -R toolkit/crashreporter/client/ && \
rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
rm -R toolkit/crashreporter/google-breakpad/src/processor/testdata/ && \
rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
rm -R toolkit/mozapps/extensions/test/ && \
rm -R xpcom/tests/
scanignore=mobile/android/base/JavaAddonManager.java
prebuild=mkdir fdroid && \
vercode=360110 && \
fxarch=i386-linux-android && \
l10ndir=`readlink -f $$MozLocales$$` && \
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
@ -346,7 +406,6 @@ Roadmap/TODO:
* Maybe (~> would require another checkout of moz-central!) do build betas, so
we can fix issues before release?
* Clean up!
* Release
.
Auto Update Mode:None