commit 0fc15a39f2adcf029676810c2ec37c566886879e Author: Nicolas Vigier <boklm@torproject.org> Date: Wed Apr 10 18:45:51 2019 +0200 Bug 29981: Fix some reproducibility issue in the android build Add files to the apk in sorted order, to avoid reproducibility issues. --- projects/tor-browser/build.android | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 7592c6b..be36abc 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -12,16 +12,25 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b [% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r -X $apk $ext_dir +[% c('zip', { + zip_src => [ '$ext_dir' ], + zip_args => '$apk', + }) %] unzip $apk lib/* zip -d $apk lib/\* [% IF c("var/android-x86") %] - zip $apk lib/x86/* + [% c('zip', { + zip_src => [ 'lib/x86/*' ], + zip_args => '$apk', + }) %] [% END %] [% IF c("var/android-armv7") %] - zip $apk lib/armeabi-v7a/* + [% c('zip', { + zip_src => [ 'lib/armeabi-v7a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib