[tbb-commits] [tor-browser-build/master] Bug 28144: Update projects/tor-browser for Android

[gk at torproject.org]

commit 6028be7e4b62d6ab419258dc3237e395f1dc34e6
Author: sisbell <shane.isbell at gmail.com>
Date:   Tue Nov 6 17:54:05 2018 -0800

    Bug 28144: Update projects/tor-browser for Android
---
 projects/tor-browser/build.android | 18 ++++++++++++++++++
 projects/tor-browser/config        | 15 ++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
new file mode 100644
index 0000000..24bdc70
--- /dev/null
+++ b/projects/tor-browser/build.android
@@ -0,0 +1,18 @@
+#!/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
+apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk
+
+mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %]
+cd /var/tmp/build
+
+mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff at eff.org.xpi
+mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
+
+zip -d $apk META-INF/\*
+zip -r $apk $ext_dir
+
+# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
+keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US"
+jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index bb1c259..e4e3a03 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -41,29 +41,41 @@ targets:
   windows-x86_64:
     var:
       mar_osname: win64
+  android-armv7:
+    build: '[% INCLUDE build.android %]'
+    var:
+      arch_deps:
+        - openjdk-8-jdk
 
 input_files:
   - project: container-image
   - filename: run_scripts
+    enable: '[% ! c("var/android") %]'
   - project: firefox
     name: firefox
   - project: tor
     name: tor
+    enable: '[% ! c("var/android") %]'
   - project: firefox-langpacks
     name: firefox-langpacks
-    enable: '[% c("var/locales").size %]'
+    enable: '[% c("var/locales").size && ! c("var/android") %]'
   - project: tor-launcher
     name: tor-launcher
+    enable: '[% ! c("var/android") %]'
   - project: torbutton
     name: torbutton
+    enable: '[% ! c("var/android") %]'
   - project: https-everywhere
     name: https-everywhere
   - project: fonts
     name: fonts
+    enable: '[% ! c("var/android") %]'
   - project: meek
     name: meek
+    enable: '[% ! c("var/android") %]'
   - project: obfs4
     name: obfs4
+    enable: '[% ! c("var/android") %]'
   - project: fteproxy
     name: fteproxy
     enable: '[% c("var/fteproxy") %]'
@@ -71,6 +83,7 @@ input_files:
     name: snowflake
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
+    enable: '[% ! c("var/android") %]'
   - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.9.9-an+fx.xpi
     name: noscript
     sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9