[tor-commits] [tor-browser-build/master] Build .apk files with distribution directory

[gk at torproject.org]

commit f38b27734129d7a83f068e09ea1a1d07327622f5
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Nov 22 14:44:28 2018 +0000

    Build .apk files with distribution directory
    
    Since #27111 landed we need a distributions directory to contain our
    additional preferences. Thus, we build now unconditionally with it.
---
 projects/firefox/mozconfig-android-armv7 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index f34e228..0098ea1 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -17,9 +17,7 @@ ac_add_options --with-branding=mobile/android/branding/torbrowser
 ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64
 ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang
 
-if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then
-    ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
-fi
+ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 
 if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
 # Because Google Play will likely be the primary distribution medium,