[tor-commits] [tor-browser-build/master] Bug 28573: Include all locales in Android testbuild

[gk at torproject.org]

commit c359853bd44b320595d5a52fc4340ab3b6825d8d
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Dec 6 08:42:19 2018 +0000

    Bug 28573: Include all locales in Android testbuild
---
 README.HACKING              | 10 +++++++++-
 projects/tor-browser/build  |  6 ++++--
 projects/tor-browser/config |  2 +-
 rbm.conf                    |  3 +--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.HACKING b/README.HACKING
index d9b0674..7634093 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild
 
 The testbuild makefile target allows you to do a build quickly in the
 testbuild directory, skipping the generation of all the locales and the
-mar files. This is useful during development.
+.mar files. This is useful during development.
+
+In the case of Android builds, we are generating a multi-locale apk,
+contrary to the desktop builds where we have one bundle for each locale.
+Removing locales in a multi-locale bundle does not make a significant
+difference in build time, therefore we still include all the locales in
+the Android testbuild. There are also no .mar files generated in the
+Android builds, so currently, in the Android case, the only difference
+introduced by the testbuild target is the output directory.
 
 By default the testbuild is based on the alpha build. All the options
 can have a different definition for the alpha, release and nightly builds.
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 250a0e9..4661f7a 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -209,7 +209,8 @@ popd
 
 # Prepare our language packs for using the proper search engines and embed
 # our default bookmarks. See bugs 18915 and 21879 for more details.
-[% FOREACH lang = c('var/locales') %]
+[% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
+[% FOREACH lang = locales %]
 [% SET lang = tmpl(lang);
    SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi';
    %]
@@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
 # If we did not create a multi-lingual package above, create a package for
 # each locale.
 [% IF ! c("var/multi_lingual") %]
-  [% FOREACH lang = c('var/locales') %]
+  [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
+  [% FOREACH lang = locales %]
     [% SET lang = tmpl(lang);
        SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi';
        SET tbdir = '$distdir/tor-browser_' _ lang;
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 149b800..43db189 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -58,7 +58,7 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - project: firefox-langpacks
     name: firefox-langpacks
-    enable: '[% c("var/locales").size && ! c("var/android") %]'
+    enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
   - project: tor-launcher
     name: tor-launcher
     enable: '[% ! c("var/android") %]'
diff --git a/rbm.conf b/rbm.conf
index 0d53855..f64a80b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -136,8 +136,7 @@ targets:
     - alpha
   testbuild:
     var:
-      # To make build faster, don't build any locale
-      locales: []
+      testbuild: 1
       # Don't create mar files to save time
       build_mar: 0