Unverified Commit 09412602 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40191: Update application-services to 67.2.0

parent ea664232

projects/application-services/build

+2 −7
Original line number Diff line number Diff line
@@ -12,18 +12,13 @@ tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] 
export PATH=$GRADLE_HOME/gradle/bin:$PATH

cd /var/tmp/dist

[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]

  # The host (i.e. Linux) bits should be the same for all four targets. Thus,

  # extracting all input files into the same place should give us a working host

  # part with all the needed target architectures.

  tar -xf $rootdir/[% c('input_files_by_name/rust-' _ arch) %]

  tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %]

  mv nss nss-[% arch %]

  tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %]

  mv sqlcipher sqlcipher-[% arch %]

[% END -%]

# We pick the armv7 flavor, but it actually does not matter which one we choose

# as `uniffi-bindgen` is a host tool. See: tor-browser-build#40171.

tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs-armv7') %]

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

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

export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH

cd $rootdir

projects/application-services/config

+4 −37
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

version: 67.0.0

git_hash: 6a234c2b1e1972f11e585551d4cf2e40e84bf16f

version: 67.2.0

git_hash: 4cc798c8cd8a1e38ce88e0bb22a05692be63b164

git_url: https://github.com/mozilla/application-services

git_submodule: 1
@@ -26,43 +26,10 @@ input_files: 
    name: '[% c("var/compiler") %]'

  - project: gradle

    name: gradle

  # We need the torbrowser-* targets for Rust and Rust-dependent projects, see:

  # #40094.

  - project: rust

    name: rust-armv7

    target_prepend:

      - torbrowser-android-armv7

  - project: rust

    name: rust-aarch64

    target_prepend:

      - torbrowser-android-aarch64

  - project: rust

    name: rust-x86

    target_prepend:

      - torbrowser-android-x86

  - project: rust

    name: rust-x86_64

    target_prepend:

      - torbrowser-android-x86_64

  # `uniffi-rs` provides us with a host tool, yet we still need to include

  # artifacts for all architectures to avoid unnecessary rebuilding later on.

  # See: tor-browser-build#40171.

    name: rust

  - project: uniffi-rs

    name: uniffi-rs-armv7

    target_prepend:

      - torbrowser-android-armv7

  - project: uniffi-rs

    name: uniffi-rs-aarch64

    target_prepend:

      - torbrowser-android-aarch64

  - project: uniffi-rs

    name: uniffi-rs-x86

    target_prepend:

      - torbrowser-android-x86

  - project: uniffi-rs

    name: uniffi-rs-x86_64

    target_prepend:

      - torbrowser-android-x86_64

    name: uniffi-rs

  - project: nss

    name: nss-armv7

    target_prepend:

projects/nss/config

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

# The required versions for application-services can be found at the respective

# commit in libs/build-all.sh

version: 3.57

version: 3.59

nspr_version: 4.29

var:

  container:
@@ -19,7 +19,7 @@ input_files: 
    project: ninja

  - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz'

    name: nss

    sha256sum: d457f915846219b20e8ad1dba80b9273e3f27aca3cebc4a0775ae8641e899ad1

    sha256sum: 2e2c09c17b1c9f43a2f0a5d83a30a712bff3016d2b7cf5a3dd904847292607ae

  - filename: configure.patch

  - filename: config.patch

  - filename: bug_13028.patch