GitLab

at 2025-06-18T18:36:17+02:00

Bug 41444: Fix android artifact generation

Bug 41444: Fix macos and windows artifact generation

There were multiple issues.

For MacOS there were missing tools, namely hfsplus and libdmg,
the location of some bundle files were different than expected
and teh generated artifacts were not the same as the ones in
Linux, so we were copying the wrong things. Finally, we were not
taking into account universal builds when copying artifacts.

For Windows we were just not copying the right artifacts.

Bug 41444: Put geckoview build artifacts in separate folders

Otherwise different architecture artifacts override each other.

Also stop compressing the final folder. It's not worth it, the size
difference is minimal.

    END; %]

 [% IF c("var/macos") %]

-  tar -C "Bundle-Data/[% c('var/ProjectName') %].dmg" -c . | tar -C "$TB_STAGE_DIR" -x

+  tar -C "$rootdir/dmg-root/[% c('var/ProjectName') %].dmg" -c . | tar -C "$TB_STAGE_DIR" -x

   pushd "$TB_STAGE_DIR"

   cp [% c('var/channel') %].DS_Store .DS_Store

   rm *.DS_Store

   popd

 [% END %]

-[% IF c("var/nightly") && c("var/linux") -%]

-  mkdir -p "$OUTDIR"/artifacts

-  cp -r $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR"

+[% IF c("var/nightly") -%]

+  [% IF c("var/macos_universal") -%]

+    mkdir -p "$OUTDIR"/artifacts/aarch64

+    cp -a $rootdir/[% c('input_files_by_name/firefox-aarch64') %]/artifacts/. "$OUTDIR/artifacts/aarch64"

+    mkdir -p "$OUTDIR"/artifacts/x86_64

+    cp -a $rootdir/[% c('input_files_by_name/firefox') %]/artifacts/. "$OUTDIR/artifacts/x86_64"

+  [% ELSE -%]

+    mkdir -p "$OUTDIR"/artifacts

+    cp -a $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR"

+  [% END -%]

 [% END %]
 [% c("var/set_default_env") -%]

 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

-tar -xf $rootdir/[% c('input_files_by_name/fenix') %]

-

 # Bundle our extension(s).

 #

 # NoScript will be copied over to the profile folder

   rm $aligned_apk

 }

+geckoviewdir="$rootdir/[% c('input_files_by_name/fenix') %]/geckoview"

+

 # Generate the QA APK and unsign patch.

 qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-qa-[% c("var/osname") %]-[% c("version") %].apk

 qa_unsign_patch="[% dest_dir %]/[% c('filename') %]/[% c('var/project-name') %]-qa-unsign-[% c('var/osname') %]-[% c('version') %].bspatch"

-apk=$rootdir/geckoview/*-[% c("var/abi") %]-*.apk

+apk=$geckoviewdir/*-[% c("var/abi") %]-*.apk

 generate_apk $qa_apk $apk $qa_unsign_patch

 # Generate the non-optimized APK used for testing and its unsign patch.

 noopt_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-noopt-[% c("var/osname") %]-[% c("version") %].apk

-noopt_final_apk=$rootdir/geckoview/tests/*-[% c("var/abi") %]-*.apk

+noopt_final_apk=$geckoviewdir/tests/*-[% c("var/abi") %]-*.apk

 generate_apk $noopt_apk $noopt_final_apk

 # Copy and sign the Android test APK.

 test_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-[% c("version") %]-androidTest.apk

-cp $rootdir/geckoview/tests/*-androidTest.apk $test_apk

+cp $geckoviewdir/tests/*-androidTest.apk $test_apk

 apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_apk --in $test_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android

 [%IF c("var/tor-browser") -%]

 [% IF c("var/nightly") -%]

   mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts"

-  cp -r $rootdir/geckoview/artifacts [% dest_dir %]/[% c('filename') %]

+  cp -r $rootdir/[% c('input_files_by_name/fenix') %]/artifacts [% dest_dir %]/[% c('filename') %]

 [% END %]
     enable: '[% ! c("var/android") %]'

   - filename: Bundle-Data

     enable: '[% ! c("var/android") %]'

+  - filename: dmg-root

+    enable: '[% ! c("var/android") %]'

   - URL: https://addons.mozilla.org/firefox/downloads/file/4411102/noscript-12.1.1.xpi

     name: noscript

     sha256sum: f9639e63ffcfc352036de00e4ff6694bb0ca65a0bb8fbd103bd08f32dc1ff31a

   [% END -%]

 [% END -%]

+[% IF c("var/macos") && c("var/nightly") %]

+  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/hfsplus-tools') %]

+  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/libdmg') %]

+[% END %]

+

 [% IF c("var/rlbox") -%]

   tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]

   export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot

   ./mach build stage-package

 [% END -%]

-[% IF c("var/nightly") && c("var/linux") -%]

+[% IF c("var/nightly") -%]

   echo "Building development artifacts"

+

+  [% IF c("var/macos") -%]

+    export MOZ_PKG_MAC_BACKGROUND=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.background/background.tiff

+    export MOZ_PKG_MAC_DSSTORE=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/nightly.DS_Store

+    export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns

+  [% END -%]

   ./mach package

   artifactsdir=[% out_dir %]/artifacts

   mkdir $artifactsdir

+

   # Copy the artifacts to the target directory

   # Naming convention is the same as Mozilla uses for their artifacts

-  cp -a obj-*/dist/*.tar.xz $artifactsdir/target.tar.xz

-  cp -a obj-*/dist/*.zip $artifactsdir/target.xpt_artifacts.zip

+  mv obj-*/dist/*.xpt_artifacts.zip $artifactsdir/target.xpt_artifacts.zip

+

+  [% IF c("var/macos") -%]

+    mv obj-*/dist/*.dmg $artifactsdir/target.dmg

+    mv obj-*/dist/*.update_framework_artifacts.zip $artifactsdir/target.update_framework_artifacts.zip

+  [% END -%]

+

+  [% IF c("var/linux") -%]

+    mv obj-*/dist/*.tar.xz $artifactsdir/target.tar.xz

+  [% END -%]

+

+  [% IF c("var/windows") -%]

+    mv obj-*/dist/*.zip $artifactsdir/target.zip

+  [% END -%]

+

   ./mach python -m mozbuild.action.test_archive common $artifactsdir/target.common.tests.tar.gz

 [% END %]

     # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin

   - filename: namecoin-etld.patch

     enable: '[% c("var/namecoin") %]'

+  - filename: dmg-root

+    enable: '[% c("var/macos") && c("var/nightly") %]'

+  - project: hfsplus-tools

+    name: hfsplus-tools

+    enable: '[% c("var/macos") && c("var/nightly") %]'

+  - project: libdmg-hfsplus

+    name: libdmg

+    enable: '[% c("var/macos") && c("var/nightly") %]'
   export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/[% c('var/build_target') %]-

   export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil"

+  [% IF c("var/nightly") -%]

+    export MKFSHFS=/var/tmp/dist/hfsplus-tools/newfs_hfs

+    export DMG_TOOL=/var/tmp/dist/libdmg-hfsplus/dmg

+    export HFS_TOOL=/var/tmp/dist/libdmg-hfsplus/hfsplus

+  [% END -%]

+

   export HOST_CFLAGS="-g"

   export HOST_CXXFLAGS="-g"

   export HOST_LDFLAGS="-g"

   echo "Building development artifacts"

   ./mach package

-  artifactsdir=[% dest_dir %]/artifacts

+  artifactsdir=$outdir/artifacts

   mkdir -p $artifactsdir

   # Copy the artifacts to the target directory

   # Naming convention is the same as Mozilla uses for their artifacts

 echo "Build finished, copying the AAR to the to the destination directory $(date)"

 [% IF !c("var/android_single_arch") -%]

-  mkdir "$distdir/[% project %]"

+  mkdir -p "$outdir/[% project %]"

   # We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name.

-  find obj-* -type f -name geckoview*omni*.aar -exec cp {} $distdir/[% project %] \;

+  find obj-* -type f -name geckoview*omni*.aar -exec mv {} $outdir/[% project %] \;

 [% ELSE -%]

 [% INCLUDE 'build_ac_fenix' %]

 [% END -%]
-

-echo "Starting to package artifacts $(date)"

-cd $distdir

-[% c('tar', {

-    tar_src => [ project ],

-    tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),

-  }) %]
   # Add our localized strings

   supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]"

   for lang in $supported_locales; do

-    cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/"

+    cp "$distdir/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/"

   done

 [% END -%]

 gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant"

 echo "Build finished, copying the APK(s) to the destination directory $(date)"

-mkdir $distdir/[% project %]

-cp $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$variant/*.apk $distdir/[% project %]

+mkdir -p $outdir/[% project %]

+mv $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$variant/*.apk $outdir/[% project %]

 echo "Building non optimized $variant Fenix APK for testing"

 gradle $GRADLE_FLAGS -PversionName="$version_name" -PdisableOptimization "assemble$variant"

 echo "Test build finished, copying the APKs to the destination directory $(date)"

-mkdir $distdir/[% project %]/tests

-cp $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$variant/*.apk $distdir/[% project %]/tests

-cp $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/androidTest/fenix/$variant/*.apk $distdir/[% project %]/tests

+mkdir -p $outdir/[% project %]/tests

+mv $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$variant/*.apk $outdir/[% project %]/tests

+mv $objdir/gradle/build/mobile/android/fenix/app/outputs/apk/androidTest/fenix/$variant/*.apk $outdir/[% project %]/tests

 popd
-
 ./mach build --verbose

 [% INCLUDE 'build_ac_fenix' %]
-

-cd $distdir/

-[% c('tar', {

-    tar_src => [ project ],

-    tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),

-  }) %]
 }) %]

 distdir=/var/tmp/dist

 builddir=/var/tmp/build

-mkdir -p $builddir $distdir

+outdir="[%  dest_dir _ '/' _ c('filename') -%]"

+mkdir -p $builddir $distdir $outdir

 tar -C $distdir -xf [% c('input_files_by_name/node') %]

 export PATH="/var/tmp/dist/node/bin:$PATH"

 # vim: filetype=yaml sw=2

 version: '[% c("abbrev") %]'

-filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'

+filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'

 git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'

 tag_gpg_id: 1

 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git

 steps:

   build_apk:

-    filename: 'geckoview-[% c("version") %]-apks-[% c("var/build_id") %].tar.[% c("compress_tar") %]'

+    filename: 'geckoview-[% c("version") %]-apks-[% c("var/build_id") %]'

     version: '[% c("abbrev") %]'

     build_apk: '[% INCLUDE build_apk %]'

     input_files:

 tmpdir="$macos_stapled_dir/tmp"

 rm -Rf "$tmpdir"

 mkdir "$tmpdir"

-cp -rT "$script_dir/../../projects/browser/Bundle-Data/$ProjName.dmg" "$tmpdir/dmg"

+cp -rT "$script_dir/../../projects/common/dmg-root/$ProjName.dmg" "$tmpdir/dmg"

 tar -C "$tmpdir" -xf "$libdmg_file"

 tar -C "$tmpdir" -xf "$hfstools_file"

brizental pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

27 changed files:

Changes: