[tbb-commits] [tor-browser-build/master] Bug 32342 - Store omni.ja after recreating apk

[gk at torproject.org]

commit 3c7fb0e610a4f85d7b157221ac9049d99d958c24
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Nov 1 13:38:19 2019 +0000

    Bug 32342 - Store omni.ja after recreating apk
---
 projects/tor-browser/build.android | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index 2c1c3b2..5148c36 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -54,5 +54,9 @@ cd tmp
    zip_args => '$apk',
    }) %]
 
+# omni.ja was likely deflated in the above zipping operation. It must be stored, instead.
+zip $apk -d assets/omni.ja
+zip -Z store $apk assets/omni.ja
+
 # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
 java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android