brizental pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
6e6a9168
by Beatriz Rizental at 2025-06-23T19:35:52+02:00
-
6efc7226
by Beatriz Rizental at 2025-06-23T19:35:52+02:00
2 changed files:
Changes:
| ... | ... | @@ -121,6 +121,6 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ |
| 121 | 121 | [% END -%]
|
| 122 | 122 | |
| 123 | 123 | [% IF c("var/nightly") -%]
|
| 124 | - mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts"
|
|
| 125 | - cp -r $rootdir/[% c('input_files_by_name/fenix') %]/artifacts [% dest_dir %]/[% c('filename') %]
|
|
| 124 | + # mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts"
|
|
| 125 | + # cp -r $rootdir/[% c('input_files_by_name/fenix') %]/artifacts [% dest_dir %]/[% c('filename') %]
|
|
| 126 | 126 | [% END %] |
| ... | ... | @@ -3,19 +3,15 @@ |
| 3 | 3 | |
| 4 | 4 | echo "Starting the creation of the fat AAR $(date)"
|
| 5 | 5 | |
| 6 | -tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %]
|
|
| 7 | -tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %]
|
|
| 8 | -tar -C $builddir -xf [% c('input_files_by_name/geckoview_x86') %]
|
|
| 9 | -tar -C $builddir -xf [% c('input_files_by_name/geckoview_x86_64') %]
|
|
| 10 | 6 | tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
|
| 11 | 7 | |
| 12 | 8 | # Specify the architectures we want to merge
|
| 13 | 9 | export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86,x86_64
|
| 14 | -export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$builddir/geckoview/*armeabi-v7a*.aar
|
|
| 15 | -export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$builddir/geckoview/*arm64-v8a*.aar
|
|
| 10 | +export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/*.aar
|
|
| 11 | +export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/*.aar
|
|
| 16 | 12 | # Specifying just "x86" is not differentiating enough
|
| 17 | -export MOZ_ANDROID_FAT_AAR_X86=$builddir/geckoview/*x86-*.aar
|
|
| 18 | -export MOZ_ANDROID_FAT_AAR_X86_64=$builddir/geckoview/*x86_64*.aar
|
|
| 13 | +export MOZ_ANDROID_FAT_AAR_X86=$rootdir/[% c('input_files_by_name/geckoview_x86') %]/geckoview/*.aar
|
|
| 14 | +export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/*.aar
|
|
| 19 | 15 | |
| 20 | 16 | cd $builddir/[% project %]-[% c("version") %]
|
| 21 | 17 | ln -s mozconfig-android-all .mozconfig
|