diff options
| -rw-r--r-- | data/buildscripts/build-android.sh | 2 | ||||
| -rw-r--r-- | data/buildscripts/mozconfig-android | 8 | ||||
| -rw-r--r-- | data/buildscripts/toolchain-android.sh | 12 | ||||
| -rw-r--r-- | data/mobile.dupes | 142 | ||||
| -rw-r--r-- | makeicecat | 8 |
5 files changed, 161 insertions, 11 deletions
diff --git a/data/buildscripts/build-android.sh b/data/buildscripts/build-android.sh index b47260b..9674e65 100644 --- a/data/buildscripts/build-android.sh +++ b/data/buildscripts/build-android.sh @@ -6,7 +6,7 @@ apt-get -q -y --force-yes build-dep firefox export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools:/usr/local/bin -pushd ./python/compare-locales/ +pushd ./l10n/compare-locales/ python setup.py build python setup.py install install -m 755 scripts/* /usr/local/bin diff --git a/data/buildscripts/mozconfig-android b/data/buildscripts/mozconfig-android index 3b21e0e..749c0aa 100644 --- a/data/buildscripts/mozconfig-android +++ b/data/buildscripts/mozconfig-android @@ -1,15 +1,14 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi mk_add_options MOZ_OBJDIR=./obj-android -ac_add_options --with-android-version=9 -ac_add_options --with-android-min-sdk=11 +#ac_add_options --with-android-version=9 +#ac_add_options --with-android-min-sdk=11 ac_add_options --enable-update-channel=gnuzilla ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --disable-eme -ac_add_options --disable-mochitest ac_add_options --disable-crashreporter ac_add_options --disable-debug @@ -24,6 +23,5 @@ mk_add_options 'export MOZ_CHROME_MULTILOCALE=en-US cs da de es-ES fi fr ja ko i mk_add_options 'export L10NBASEDIR=$PWD/l10n' ac_add_options --with-l10n-base=$PWD/l10n -ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux/platforms/android-22/ +ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r10e - diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh index 59a3456..b95350a 100644 --- a/data/buildscripts/toolchain-android.sh +++ b/data/buildscripts/toolchain-android.sh @@ -3,7 +3,7 @@ set -e set -x -apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache +apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache lib32stdc++6 lib32z1 apt-get -q -y --force-yes build-dep firefox WD=android-build @@ -13,9 +13,9 @@ cd $WD #wget https://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2 #tar -xjf android-ndk-r8e-linux-x86.tar.bz2 -wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin -chmod 755 android-ndk-r10e-linux-x86.bin -./android-ndk-r10e-linux-x86.bin +wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin +chmod 755 android-ndk-r10e-linux-x86_64.bin +./android-ndk-r10e-linux-x86_64.bin wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz tar -xzf android-sdk_r24.3.3-linux.tgz @@ -23,6 +23,10 @@ tar -xzf android-sdk_r24.3.3-linux.tgz while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update sdk -u #while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update adb +wget https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip +unzip build-tools_r23.0.3-linux.zip +mv android-6.0 android-sdk-linux/build-tools/23.0.3 + echo export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools diff --git a/data/mobile.dupes b/data/mobile.dupes new file mode 100644 index 0000000..83adba7 --- /dev/null +++ b/data/mobile.dupes @@ -0,0 +1,142 @@ + +# Extra dupes in IceCat +chrome/en-US/locale/en-US/browser/aboutPrivateBrowsing.dtd +chrome/cs/locale/cs/browser/aboutPrivateBrowsing.dtd +chrome/da/locale/da/browser/aboutPrivateBrowsing.dtd +chrome/de/locale/de/browser/aboutPrivateBrowsing.dtd +chrome/es-ES/locale/es-ES/browser/aboutPrivateBrowsing.dtd +chrome/fi/locale/fi/browser/aboutPrivateBrowsing.dtd +chrome/fr/locale/fr/browser/aboutPrivateBrowsing.dtd +chrome/ja/locale/ja/browser/aboutPrivateBrowsing.dtd +chrome/ko/locale/ko/browser/aboutPrivateBrowsing.dtd +chrome/it/locale/it/browser/aboutPrivateBrowsing.dtd +chrome/nb-NO/locale/nb-NO/browser/aboutPrivateBrowsing.dtd +chrome/nl/locale/nl/browser/aboutPrivateBrowsing.dtd +chrome/pl/locale/pl/browser/aboutPrivateBrowsing.dtd +chrome/pt-BR/locale/pt-BR/browser/aboutPrivateBrowsing.dtd +chrome/pt-PT/locale/pt-PT/browser/aboutPrivateBrowsing.dtd +chrome/ru/locale/ru/browser/aboutPrivateBrowsing.dtd +chrome/sk/locale/sk/browser/aboutPrivateBrowsing.dtd +chrome/sv-SE/locale/sv-SE/browser/aboutPrivateBrowsing.dtd +chrome/zh-CN/locale/zh-CN/browser/aboutPrivateBrowsing.dtd +chrome/zh-TW/locale/zh-TW/browser/aboutPrivateBrowsing.dtd +chrome/en-US/locale/en-US/browser/about.dtd +chrome/cs/locale/cs/browser/about.dtd +chrome/da/locale/da/browser/about.dtd +chrome/de/locale/de/browser/about.dtd +chrome/es-ES/locale/es-ES/browser/about.dtd +chrome/fi/locale/fi/browser/about.dtd +chrome/fr/locale/fr/browser/about.dtd +chrome/ja/locale/ja/browser/about.dtd +chrome/ko/locale/ko/browser/about.dtd +chrome/it/locale/it/browser/about.dtd +chrome/nb-NO/locale/nb-NO/browser/about.dtd +chrome/nl/locale/nl/browser/about.dtd +chrome/pl/locale/pl/browser/about.dtd +chrome/pt-BR/locale/pt-BR/browser/about.dtd +chrome/pt-PT/locale/pt-PT/browser/about.dtd +chrome/ru/locale/ru/browser/about.dtd +chrome/sk/locale/sk/browser/about.dtd +chrome/sv-SE/locale/sv-SE/browser/about.dtd +chrome/zh-CN/locale/zh-CN/browser/about.dtd +chrome/zh-TW/locale/zh-TW/browser/about.dtd +chrome/en-US/locale/en-US/browser/pippki.properties +chrome/cs/locale/cs/browser/pippki.properties +chrome/da/locale/da/browser/pippki.properties +chrome/de/locale/de/browser/pippki.properties +chrome/es-ES/locale/es-ES/browser/pippki.properties +chrome/fi/locale/fi/browser/pippki.properties +chrome/fr/locale/fr/browser/pippki.properties +chrome/ja/locale/ja/browser/pippki.properties +chrome/ko/locale/ko/browser/pippki.properties +chrome/it/locale/it/browser/pippki.properties +chrome/nb-NO/locale/nb-NO/browser/pippki.properties +chrome/nl/locale/nl/browser/pippki.properties +chrome/pl/locale/pl/browser/pippki.properties +chrome/pt-BR/locale/pt-BR/browser/pippki.properties +chrome/pt-PT/locale/pt-PT/browser/pippki.properties +chrome/ru/locale/ru/browser/pippki.properties +chrome/sk/locale/sk/browser/pippki.properties +chrome/sv-SE/locale/sv-SE/browser/pippki.properties +chrome/zh-CN/locale/zh-CN/browser/pippki.properties +chrome/zh-TW/locale/zh-TW/browser/pippki.properties +chrome/en-US/locale/en-US/browser/aboutCertError.dtd +chrome/cs/locale/cs/browser/aboutCertError.dtd +chrome/da/locale/da/browser/aboutCertError.dtd +chrome/de/locale/de/browser/aboutCertError.dtd +chrome/es-ES/locale/es-ES/browser/aboutCertError.dtd +chrome/fi/locale/fi/browser/aboutCertError.dtd +chrome/fr/locale/fr/browser/aboutCertError.dtd +chrome/ja/locale/ja/browser/aboutCertError.dtd +chrome/ko/locale/ko/browser/aboutCertError.dtd +chrome/it/locale/it/browser/aboutCertError.dtd +chrome/nb-NO/locale/nb-NO/browser/aboutCertError.dtd +chrome/nl/locale/nl/browser/aboutCertError.dtd +chrome/pl/locale/pl/browser/aboutCertError.dtd +chrome/pt-BR/locale/pt-BR/browser/aboutCertError.dtd +chrome/pt-PT/locale/pt-PT/browser/aboutCertError.dtd +chrome/ru/locale/ru/browser/aboutCertError.dtd +chrome/sk/locale/sk/browser/aboutCertError.dtd +chrome/sv-SE/locale/sv-SE/browser/aboutCertError.dtd +chrome/zh-CN/locale/zh-CN/browser/aboutCertError.dtd +chrome/zh-TW/locale/zh-TW/browser/aboutCertError.dtd +chrome/en-US/locale/en-US/browser/appstrings.properties +chrome/cs/locale/cs/browser/appstrings.properties +chrome/da/locale/da/browser/appstrings.properties +chrome/de/locale/de/browser/appstrings.properties +chrome/es-ES/locale/es-ES/browser/appstrings.properties +chrome/fi/locale/fi/browser/appstrings.properties +chrome/fr/locale/fr/browser/appstrings.properties +chrome/ja/locale/ja/browser/appstrings.properties +chrome/ko/locale/ko/browser/appstrings.properties +chrome/it/locale/it/browser/appstrings.properties +chrome/nb-NO/locale/nb-NO/browser/appstrings.properties +chrome/nl/locale/nl/browser/appstrings.properties +chrome/pl/locale/pl/browser/appstrings.properties +chrome/pt-BR/locale/pt-BR/browser/appstrings.properties +chrome/pt-PT/locale/pt-PT/browser/appstrings.properties +chrome/ru/locale/ru/browser/appstrings.properties +chrome/sk/locale/sk/browser/appstrings.properties +chrome/sv-SE/locale/sv-SE/browser/appstrings.properties +chrome/zh-CN/locale/zh-CN/browser/appstrings.properties +chrome/zh-TW/locale/zh-TW/browser/appstrings.properties +chrome/en-US/locale/en-US/browser/netError.dtd +chrome/cs/locale/cs/browser/netError.dtd +chrome/da/locale/da/browser/netError.dtd +chrome/de/locale/de/browser/netError.dtd +chrome/es-ES/locale/es-ES/browser/netError.dtd +chrome/fi/locale/fi/browser/netError.dtd +chrome/fr/locale/fr/browser/netError.dtd +chrome/ja/locale/ja/browser/netError.dtd +chrome/ko/locale/ko/browser/netError.dtd +chrome/it/locale/it/browser/netError.dtd +chrome/nb-NO/locale/nb-NO/browser/netError.dtd +chrome/nl/locale/nl/browser/netError.dtd +chrome/pl/locale/pl/browser/netError.dtd +chrome/pt-BR/locale/pt-BR/browser/netError.dtd +chrome/pt-PT/locale/pt-PT/browser/netError.dtd +chrome/ru/locale/ru/browser/netError.dtd +chrome/sk/locale/sk/browser/netError.dtd +chrome/sv-SE/locale/sv-SE/browser/netError.dtd +chrome/zh-CN/locale/zh-CN/browser/netError.dtd +chrome/zh-TW/locale/zh-TW/browser/netError.dtd +chrome/en-US/locale/en-US/browser/browser.properties +chrome/cs/locale/cs/browser/browser.properties +chrome/da/locale/da/browser/browser.properties +chrome/de/locale/de/browser/browser.properties +chrome/es-ES/locale/es-ES/browser/browser.properties +chrome/fi/locale/fi/browser/browser.properties +chrome/fr/locale/fr/browser/browser.properties +chrome/ja/locale/ja/browser/browser.properties +chrome/ko/locale/ko/browser/browser.properties +chrome/it/locale/it/browser/browser.properties +chrome/nb-NO/locale/nb-NO/browser/browser.properties +chrome/nl/locale/nl/browser/browser.properties +chrome/pl/locale/pl/browser/browser.properties +chrome/pt-BR/locale/pt-BR/browser/browser.properties +chrome/pt-PT/locale/pt-PT/browser/browser.properties +chrome/ru/locale/ru/browser/browser.properties +chrome/sk/locale/sk/browser/browser.properties +chrome/sv-SE/locale/sv-SE/browser/browser.properties +chrome/zh-CN/locale/zh-CN/browser/browser.properties +chrome/zh-TW/locale/zh-TW/browser/browser.properties @@ -537,6 +537,7 @@ MOZ_DATA_REPORTING=0 MOZ_SERVICES_SYNC=0 MOZ_DEVICES=0 MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0 +MOZ_ADDON_SIGNING=0 EOF rm -R mobile/android/gradle/ @@ -562,6 +563,10 @@ cp -a $DATA/android-images/resources mobile/android/base sed '/aboutDetails/,/div/d; /privacyURL/d' mobile/android/chrome/content/about.xhtml -i #sed '/suggested_sites/,/defaultValue/d' mobile/android/base/resources/xml/preferences_home.xml -i +sed '/SENDERID/d' -i mobile/android/app/mobile.js + +cat $DATA/mobile.dupes >> mobile/android/installer/allowed-dupes.mn + ############################################################################### # Macos packaging ############################################################################### @@ -609,7 +614,7 @@ EOF # Add extensions to manifest for EXTENSION in $(ls $DATA/extensions/); do sed "/Browser Chrome Files/s%$%\n@RESPATH@/browser/extensions/$EXTENSION/*%" -i browser/installer/package-manifest.in -sed "/Browser Chrome Files/s%$%\n@BINPATH@/browser/extensions/$EXTENSION/*%" -i mobile/android/installer/package-manifest.in +sed "/Browser Chrome Files/s%$%\n@BINPATH@/distribution/extensions/$EXTENSION/*%" -i mobile/android/installer/package-manifest.in #echo "DIRS += ['$EXTENSION']" >> browser/app/profile/extensions/moz.build #touch browser/app/profile/extensions/$EXTENSION/moz.build done @@ -662,6 +667,7 @@ cat << EOF >> ./browser/installer/allowed-dupes.mn browser/chrome/browser/content/browser/aboutaccounts/images/fox.png EOF find extensions/gnu/ | sed s=extensions/gnu=browser/extensions= >> ./browser/installer/allowed-dupes.mn +find extensions/gnu/ | sed s=extensions/gnu=distribution/extensions= >> mobile/android/installer/allowed-dupes.mn ############################################################################### # Deb generation specifics |