Unverified Commit 524a9364 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 26843: Adding multi-locale support for Tor Browser for Android

parent 30c764db
......@@ -3,6 +3,9 @@
[% c("var/set_default_env") -%]
[% IF c("var/android") %]
export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]"
# Prepare building the multi-locale .apk
mkdir -p /var/tmp/dist/locales
tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %]
[% END -%]
[% IF c("var/windows") -%]
......@@ -154,7 +157,14 @@ rm -f js/src/configure
./mach build --verbose
[% IF c("var/android") %]
./mach package
# Building a multi-locale .apk
[% FOREACH lang = c('var/locales') %]
[% SET lang = tmpl(lang) %]
./mach build chrome-[% lang %];
[% END %]
export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]'
AB_CD=multi ./mach package
# Copy the result over and return. There is nothing more to do for mobile.
cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk
[% RETURN %]
[% END %]
......
......@@ -135,3 +135,6 @@ input_files:
- project: orbot
name: orbot
enable: '[% c("var/android") %]'
- project: firefox-locale-bundle
name: firefox-locale-bundle
enable: '[% c("var/android") %]'
......@@ -18,6 +18,7 @@ ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/
ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang
ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
ac_add_options --with-l10n-base=/var/tmp/dist/locales
if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
# Because Google Play will likely be the primary distribution medium,
......
#!/bin/bash
[% c("var/set_default_env") -%]
ext_dir=assets/distribution/extensions
qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk
qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk
apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk
mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment