Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
23474930
by Pier Angelo Vendrame at 2024-01-24T17:08:30+01:00
2 changed files:
Changes:
... | ... | @@ -46,13 +46,19 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] "$noscript_path" |
46 | 46 | |
47 | 47 | mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json
|
48 | 48 | |
49 | -[% c('zip', {
|
|
50 | - zip_src => [ '$assets_dir' ],
|
|
51 | - zip_args => '$apk',
|
|
52 | - }) %]
|
|
49 | +mkdir apk
|
|
50 | +pushd apk
|
|
51 | +7zz x "$apk"
|
|
52 | +cp -R ../assets ./
|
|
53 | +find -type f -exec touch -m -t '[% USE date; date.format(pc("firefox-android", "timestamp"), format = "%Y%m%d%H%M") %]' {} \;
|
|
54 | +find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt
|
|
55 | +7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt
|
|
56 | +# resources.arsc must not be compressed as per the APK specifications
|
|
57 | +7zz a -tzip -mm=Copy -mtc- ../repacked.apk resources.arsc
|
|
58 | +popd
|
|
53 | 59 | |
54 | 60 | aligned_apk=$(basename $apk .apk)_aligned.apk
|
55 | -zipalign -vp 4 $apk $aligned_apk
|
|
61 | +zipalign -vp 4 repacked.apk $aligned_apk
|
|
56 | 62 | |
57 | 63 | # Sign a QA build. This .apk is not a debug version and doesn't contain a debug
|
58 | 64 | # flag in the manifest.
|
... | ... | @@ -46,7 +46,13 @@ targets: |
46 | 46 | var:
|
47 | 47 | verify_allowed_addons: 1
|
48 | 48 | arch_deps:
|
49 | - - openjdk-11-jdk-headless
|
|
49 | + - 7zip
|
|
50 | + - openjdk-17-jdk-headless
|
|
51 | + container:
|
|
52 | + # 7zip is in backports in bullseye, and we can already use Java 17 for
|
|
53 | + # apksigner.
|
|
54 | + suite: bookworm
|
|
55 | + arch: amd64
|
|
50 | 56 | torbrowser:
|
51 | 57 | var:
|
52 | 58 | prefs_file: 000-tor-browser.js
|