[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41744: Reduce duplication between projects/geckoview/build and projects/geckoview/build_apk

Title: GitLab

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

Commits:

  • 84af6965
    by Nicolas Vigier at 2026-03-02T18:27:45+01:00 
    Bug 41744: Reduce duplication between projects/geckoview/build and projects/geckoview/build_apk

3 changed files:

Changes:

  • projects/geckoview/build
    1 1 
     #!/bin/bash
    2 
    -[% INCLUDE 'build_common' %]
    2 
    +[% c("var/set_default_env") -%]
    3 3
    4 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
    5 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]
    6 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]
    7 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
    4 
    +mkdir -p /var/tmp/dist
    5 
    +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %]
    6 
    +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/cbindgen') %]
    7 
    +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nasm') %]
    8 
    +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/clang') %]
    8 9 
     export LLVM_CONFIG="/var/tmp/dist/clang-linux/bin/llvm-config"
    9 10 
     export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang-linux/bin:$PATH"
    10 11
    11 12 
     [% IF c("var/rlbox") -%]
    12 
    -  tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
    13 
    +  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasi-sysroot') %]
    13 14 
       export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/
    14 15 
     [% END -%]
    15 16
    16 
    -cd /var/tmp/build/[% project %]-[% c("version") %]
    17 
    -cp $rootdir/mozconfig ./
    18 
    -
    19 
    -echo "Starting ./mach configure $(date)"
    20 
    -./mach configure \
    21 
    -  [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \
    22 
    -  [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \
    23 
    -  [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
    17 
    +[% INCLUDE 'build_common' %]
    24 18
    25 19 
     echo "Starting ./mach build $(date)"
    26 20 
     ./mach build --verbose [% IF c('var/generate_gradle_dependencies_list') %]2>&1 | tee -a $gradle_logs[% END %]

  • projects/geckoview/build_apk
    1 1 
     #!/bin/bash
    2 
    -[% INCLUDE 'build_common' %]
    2 
    +[% c("var/set_default_env") -%]
    3 3
    4 
    -echo "Starting the creation of the fat AAR $(date)"
    4 
    +# Specify the architectures we want to merge
    5 
    +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64
    6 
    +export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip
    7 
    +export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip
    8 
    +export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip
    5 9
    6 
    -tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    10 
    +[% INCLUDE 'build_common' %]
    7 11
    12 
    +./mach build --verbose
    8 13
    9 14 
     [% IF c("var/dev_artifacts") -%]
    10 15 
       mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a
    ... ... @@ -15,22 +20,4 @@ tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %
    15 20 
       mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64
    16 21 
     [% END -%]
    17 22
    18 
    -# Specify the architectures we want to merge
    19 
    -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64
    20 
    -export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip
    21 
    -export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip
    22 
    -export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip
    23 
    -
    24 
    -cd $builddir/[% project %]-[% c("version") %]
    25 
    -cp $rootdir/mozconfig ./
    26 
    -
    27 
    -# We still need to specify --base-browser-version due to bug 34005.
    28 
    -./mach configure \
    29 
    -  --with-base-browser-version=[% c("var/torbrowser_version") %] \
    30 
    -  --enable-update-channel=[% c("var/variant") %] \
    31 
    -  --with-branding=$branding_dir \
    32 
    -  [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
    33 
    -
    34 
    -./mach build --verbose
    35 
    -
    36 23 
     [% INCLUDE 'build_ac_fenix' %]

  • projects/geckoview/build_common
    1 
    -[% c("var/set_default_env") -%]
    2 1 
     [% pc(c('var/compiler'), 'var/setup', {
    3 2 
       compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')),
    4 3 
     }) %]
    ... ... @@ -82,3 +81,13 @@ touch $HOME/.mozbuild/android-device/avd
    82 81 
     chmod +x $HOME/.mozbuild/android-device/avd
    83 82
    84 83 
     [% INCLUDE 'browser-localization' %]
    84 
    +
    85 
    +cd $builddir/[% project %]-[% c("version") %]
    86 
    +cp $rootdir/mozconfig ./
    87 
    +
    88 
    +echo "Starting ./mach configure $(date)"
    89 
    +# We still need to specify --base-browser-version due to bug 34005.
    90 
    +./mach configure \
    91 
    +  [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \
    92 
    +  [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \
    93 
    +  [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/84af69658a0668597b612b31628b5fdd8d487510 at 1772533260 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx