[tor-commits] [tor-browser-build/master] Bug 29809 - Delete tor binary for other architectures

[gk at torproject.org]

commit 9cef2ffa0a3299a3d44eefe9757054e4b620b34e
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Tue Mar 19 12:43:01 2019 +0000

    Bug 29809 - Delete tor binary for other architectures
---
 projects/tor-browser/build.android | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index d56d4b5..2de8d36 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -14,5 +14,15 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b
 zip -d $apk META-INF/\*
 zip -r -X $apk $ext_dir
 
+zip -d $apk lib/armeabi/tor.so
+
+[% IF c("var/android-x86") %]
+    zip -d $apk lib/armeabi-v7a/tor.so
+[% END %]
+
+[% IF c("var/android-armv7") %]
+    zip -d $apk lib/x86/tor.so
+[% END %]
+
 # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
 [% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android