Unverified Commit bc702093 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_40191_v3'

parents 708ea627 71531cf8

projects/android-components/config

+3 −3
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg 
variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'



var:

  android_components_version: 67.0.11

  android_components_version: 70.0.0

  torbrowser_branch: 10.5

  container:

    use_container: 1

  # This should be updated when the list of gradle dependencies is changed.

  gradle_dependencies_version: 12

  gradle_dependencies_version: 14

  # Switch to make it easier to grab all dependencies during a dry-run.

  # Note: Use the commit before support for new GeckoView interfaces gets added.

  fetch_gradle_dependencies: 0
@@ -47,5 +47,5 @@ input_files: 
  - filename: mavenLocal.patch

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

  - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2

    sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4

    sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2

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

projects/android-components/gradle-dependencies-list.txt

+137 −105

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −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
@@ -19,6 +19,8 @@ var: 
  application_services: 1

  # Switch to make it easier to grab all dependencies during a dry-run.

  fetch_gradle_dependencies: 0

  # application-services is still stuck on an older glean_parser version.

  glean_parser: 1.28.6



input_files:

  - project: container-image
@@ -26,43 +28,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/cbindgen/config

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
version: '[% c("var/cbindgen_version") %]'

git_url: https://github.com/eqrion/cbindgen

git_hash: '[% c("var/cbindgen_hash") %]'

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

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



var:

  cbindgen_version: 0.14.1