Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eb372d59 by Pier Angelo Vendrame at 2025-10-06T16:23:35+02:00 Bug 41576: Do not build expert bundles in containers. - - - - - 5 changed files: - projects/tor-expert-bundle-aar/build - projects/tor-expert-bundle-aar/config - + projects/tor-expert-bundle/MANIFEST.MF - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config Changes: ===================================== projects/tor-expert-bundle-aar/build ===================================== @@ -2,17 +2,21 @@ [% c("var/set_default_env") -%] distdir=[% dest_dir %]/[% c('filename') %] -mkdir -p /var/tmp/build $distdir - -mkdir tor-expert-bundle-aar -cd tor-expert-bundle-aar +mkdir -p $distdir [% IF c("var/android_single_arch") -%] - unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle-[% c("arch") %].aar + mv $rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle-[% c("arch") %].aar $distdir/tor-expert-bundle.aar [% ELSE -%] + mkdir aar + cd aar + + # We take for granted that we can take the manifests from any of the bundles + # without having to change it. [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar [% END -%] + [% c('zip', { + zip_src => [ '*' ], + zip_args => '$distdir/tor-expert-bundle.aar' + }) %] [% END -%] - -jar -cvf $distdir/tor-expert-bundle.aar * ===================================== projects/tor-expert-bundle-aar/config ===================================== @@ -1,13 +1,10 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -container: - use_container: 1 var: input_files: - - project: container-image - project: tor-expert-bundle name: tor-expert-bundle-armv7 target_replace: ===================================== projects/tor-expert-bundle/MANIFEST.MF ===================================== @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + ===================================== projects/tor-expert-bundle/build ===================================== @@ -1,6 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] +distdir=$rootdir/[% project %] mkdir -p $distdir output_dir=[% dest_dir %]/[% c('filename') %] @@ -41,11 +41,9 @@ cd $distdir # package a .aar on android [% IF c("var/android") -%] - aar_file=torExpertBundle-[% c('arch') %].aar - abi=[% c('var/abi') %] - mkdir aar + mkdir -p aar/META-INF mkdir -p aar/jni/$abi mkdir -p aar/assets/common @@ -61,10 +59,15 @@ cd $distdir cp -a tor/pluggable_transports/pt_config.json aar/assets/common/ - cp -a $rootdir/AndroidManifest.xml aar/ + cp $rootdir/AndroidManifest.xml aar/ + cp $rootdir/MANIFEST.MF aar/META-INF/ + [% c("touch") %] aar/AndroidManifest.xml aar/META-INF/MANIFEST.MF cd aar - jar -cvf $output_dir/tor-expert-bundle-[% c('arch') %].aar * + [% c('zip', { + zip_src => [ '*' ], + zip_args => '$output_dir/tor-expert-bundle-' _ c('arch') _ '.aar' + }) %] cd .. [% END %] ===================================== projects/tor-expert-bundle/config ===================================== @@ -2,16 +2,12 @@ filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' version: '[% c("var/torbrowser_version") %]' -container: - use_container: 1 - targets: windows: var: pt_extension: .exe input_files: - - project: container-image - name: tor project: tor - name: lyrebird @@ -22,3 +18,5 @@ input_files: - filename: pt_config.json - filename: AndroidManifest.xml enable: '[% c("var/android") %]' + - filename: MANIFEST.MF + enable: '[% c("var/android") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/eb... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/eb... You're receiving this email because of your account on gitlab.torproject.org.