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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41123: Drop the firefox-android project.

Title: GitLab

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

Commits:

  • 613f597e
    by Pier Angelo Vendrame at 2024-08-14T17:04:05+02:00 
    Bug 41123: Drop the firefox-android project.

While we already migrated the APKs creation in GeckoView, we still had
the old firefox-android project lying around, but we do not need it
anymore.
  • 096681b3
    by Pier Angelo Vendrame at 2024-08-14T17:11:48+02:00 
    Bug 41210: Use tor-expert-bundle-aar in GeckoView.

We had already migrated most of the firefox-android project to
GeckoView, except for the part in which we copied tor-expert-bundle.aar
to the correct directory.

Now that our Android patchset is ready, we should do it, otherwise the
builds fail.

7 changed files:

Changes:

  • projects/firefox-android/build deleted
    1 
    -#!/bin/bash
    2 
    -[% c("var/set_default_env") -%]
    3 
    -[% pc(c('var/compiler'), 'var/setup', {
    4 
    -    compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')),
    5 
    -    gradle_tarfile => c("input_files_by_name/gradle"),
    6 
    -  }) %]
    7 
    -distdir=/var/tmp/dist
    8 
    -builddir=/var/tmp/build/[% project %]
    9 
    -mkdir $distdir/[% project %]
    10 
    -mkdir /var/tmp/build
    11 
    -
    12 
    -[% c("var/set_MOZ_BUILD_DATE") %]
    13 
    -
    14 
    -# TODO: Something to fetch the gradle dependencies, automatically?
    15 
    -
    16 
    -gradle_repo=$distdir/gradle-dependencies
    17 
    -mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
    18 
    -cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true
    19 
    -cp -rl $gradle_repo/m2/* $gradle_repo || true
    20 
    -cp -rl $gradle_repo/maven2/* $gradle_repo || true
    21 
    -
    22 
    -tar -C $distdir -xf [% c('input_files_by_name/geckoview') %]
    23 
    -cp -r $distdir/geckoview/* $gradle_repo
    24 
    -tar -C $distdir -xf [% c('input_files_by_name/application-services') %]
    25 
    -cp -rf $distdir/application-services/maven/* $gradle_repo
    26 
    -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %]
    27 
    -
    28 
    -mkdir bin
    29 
    -cat > bin/git << 'EOF'
    30 
    -#!/bin/bash
    31 
    -# Used to include the commit hash in the build
    32 
    -if [ "$1" = "rev-parse" ]; then
    33 
    -  echo "[% c('abbrev') %]"
    34 
    -  exit 0
    35 
    -fi
    36 
    -
    37 
    -# If there are uncommitted files (checked with `git status --porcelain=v2`), the
    38 
    -# build system will append a `+` to the commit hash. So, report a clean tree.
    39 
    -if [ "$1" = "status" ]; then
    40 
    -  exit 0
    41 
    -fi
    42 
    -
    43 
    -# Try to catch any other calls by making them fail
    44 
    -echo "fake-git: not implemented command $1"
    45 
    -exit 1
    46 
    -EOF
    47 
    -chmod +x bin/git
    48 
    -export PATH=$rootdir/bin:$PATH
    49 
    -
    50 
    -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    51 
    -cd $builddir-[% c('version') %]
    52 
    -
    53 
    -patch -p1 < $rootdir/repos.diff
    54 
    -sed -i 's|^\(val VERSION = \).*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
    55 
    -sed -i 's|^\(val CHANNEL = \).*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
    56 
    -[% IF c("var/channel") == "release" -%]
    57 
    -  gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-omni"
    58 
    -[% ELSE -%]
    59 
    -  gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni"
    60 
    -[% END -%]
    61 
    -gv_version=$(find "$gv_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
    62 
    -sed -i "s|\(\s*const val version = \).*|\1\"$gv_version\"|" android-components/plugins/dependencies/src/main/java/Gecko.kt
    63 
    -sed -i 's|\(\s*val channel = \).*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt
    64 
    -
    65 
    -export LC_ALL=C.UTF-8
    66 
    -export LANG=C.UTF-8
    67 
    -
    68 
    -# Increase the maximum memory usage, for when compiling GeckoView with
    69 
    -# --disable-install-strip
    70 
    -gradle_args="--offline --no-daemon -Dorg.gradle.jvmargs=-Xmx8g -PcentralRepo=file://$gradle_repo"
    71 
    -as_version="[% c('var/as_version') %]"
    72 
    -
    73 
    -# Build AC
    74 
    -pushd android-components
    75 
    -
    76 
    -tar -xf $rootdir/[% c('input_files_by_name/glean') %]
    77 
    -# Force the installation of the wheels now, otherwise the build could fail in
    78 
    -# environments with a lot of cores.
    79 
    -# See taskcluster/scripts/toolchain/external-gradle-dependencies.sh.
    80 
    -gradle $gradle_args support-sync-telemetry:assemble
    81 
    -
    82 
    -mkdir -p "build/bin/nimbus/$as_version"
    83 
    -cp $distdir/application-services/nimbus-fml "build/bin/nimbus/$as_version"
    84 
    -
    85 
    -gradle $gradle_args assembleGecko -x lint
    86 
    -gradle $gradle_args publish
    87 
    -popd
    88 
    -
    89 
    -# Build Fenix
    90 
    -
    91 
    -pushd fenix
    92 
    -
    93 
    -# Use the Android Components we have just built
    94 
    -echo autoPublish.android-components.dir=../android-components > local.properties
    95 
    -
    96 
    -# Add our localized strings
    97 
    -supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]"
    98 
    -for lang in $supported_locales; do
    99 
    -  cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/"
    100 
    -done
    101 
    -
    102 
    -# Move Tor Android libraries
    103 
    -cp $rootdir/[% c('input_files_by_name/teb') %]/tor-expert-bundle.aar app/
    104 
    -
    105 
    -mkdir -p "build/bin/nimbus/$as_version"
    106 
    -cp $distdir/application-services/nimbus-fml "build/bin/nimbus/$as_version"
    107 
    -
    108 
    -# Bug 40485: Inject deterministic build date into Glean.
    109 
    -echo 'ext.gleanBuildDate = "0"' >> app/build.gradle
    110 
    -
    111 
    -variant='[% c("var/variant") %]'
    112 
    -# We put the tor-browser version last to avoid int-parsing errors when consumers of project.versionName
    113 
    -# assume it starts with a major version number, as it does for all Mozilla version names.
    114 
    -version_name="[% c('var/fenix_version') %]-${variant,} ([% c('var/torbrowser_version') %])"
    115 
    -
    116 
    -gradle $gradle_args -PversionName="$version_name" "assemble$variant"
    117 
    -cp app/build/outputs/apk/fenix/${variant,}/*.apk $distdir/[% project %]
    118 
    -
    119 
    -popd
    120 
    -
    121 
    -cd $distdir
    122 
    -[% c('tar', {
    123 
    -    tar_src => [ project ],
    124 
    -    tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
    125 
    -  }) %]

  • projects/firefox-android/config deleted
    1 
    -# vim: filetype=yaml sw=2
    2 
    -version: '[% c("abbrev") %]'
    3 
    -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    4 
    -git_hash: '[% project %]-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'
    5 
    -git_url: https://gitlab.torproject.org/tpo/applications/firefox-android.git
    6 
    -tag_gpg_id: 1
    7 
    -gpg_keyring:
    8 
    -  - boklm.gpg
    9 
    -  - dan_b.gpg
    10 
    -  - ma1.gpg
    11 
    -  - pierov.gpg
    12 
    -  - morgan.gpg
    13 
    -container:
    14 
    -  use_container: 1
    15 
    -
    16 
    -var:
    17 
    -  fenix_version: 115.2.1
    18 
    -  browser_branch: 13.5-1
    19 
    -  browser_build: 11
    20 
    -  variant: Beta
    21 
    -  # This should be updated when the list of gradle dependencies is changed.
    22 
    -  gradle_dependencies_version: 1
    23 
    -  gradle_version: 7.6.1
    24 
    -  glean_parser: 7.1.0
    25 
    -  as_version: '[% pc("application-services", "version") %]'
    26 
    -
    27 
    -targets:
    28 
    -  release:
    29 
    -    var:
    30 
    -      variant: Release
    31 
    -  nightly:
    32 
    -    git_hash: '[% project %]-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]'
    33 
    -    tag_gpg_id: 0
    34 
    -    var:
    35 
    -      variant: Nightly
    36 
    -
    37 
    -steps:
    38 
    -  list_toolchain_updates:
    39 
    -    git_url: https://github.com/mozilla-mobile/firefox-android
    40 
    -    git_hash: releases_v115
    41 
    -    tag_gpg_id: 0
    42 
    -    input_files: []
    43 
    -    container:
    44 
    -      use_container: 0
    45 
    -
    46 
    -input_files:
    47 
    -  - project: container-image
    48 
    -  - name: '[% c("var/compiler") %]'
    49 
    -    project: '[% c("var/compiler") %]'
    50 
    -  - project: gradle
    51 
    -    name: gradle
    52 
    -  - name: application-services
    53 
    -    project: application-services
    54 
    -  - name: geckoview
    55 
    -    project: geckoview
    56 
    -    enable: '[% c("var/android_single_arch") %]'
    57 
    -  - name: geckoview
    58 
    -    project: geckoview
    59 
    -    pkg_type: merge_aars
    60 
    -    enable: '[% !c("var/android_single_arch") %]'
    61 
    -  - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
    62 
    -    name: glean
    63 
    -    sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
    64 
    -    enable: '[% !c("var/fetch_gradle_dependencies") %]'
    65 
    -  - name: translation-fenix
    66 
    -    project: translation
    67 
    -    pkg_type: fenix
    68 
    -  - project: tor-expert-bundle-aar
    69 
    -    name: teb
    70 
    -  - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
    71 
    -    name: gradle-dependencies
    72 
    -    exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
    73 
    -  - filename: repos.diff

  • projects/firefox-android/gradle-dependencies-list.txt deleted The diff for this file was not included because it is too large.
  • projects/firefox-android/list_toolchain_updates_checks deleted
    1 
    -#!/bin/bash
    2 
    -
    3 
    -##########################
    4 
    -### android-components ###
    5 
    -##########################
    6 
    -
    7 
    -cd android-components
    8 
    -
    9 
    -# compileSdkVersion
    10 
    -read -d '' p << 'EOF' || true
    11 
    -if (m/compileSdkVersion:\\s+(.*)$/) {
    12 
    -  print $1;
    13 
    -  exit;
    14 
    -}
    15 
    -EOF
    16 
    -needed=$(cat .config.yml | perl -ne "$p")
    17 
    -current=33
    18 
    -check_update_needed 'compileSdkVersion [android-components]' "$needed" "$current"
    19 
    -
    20 
    -
    21 
    -# targetSdkVersion
    22 
    -read -d '' p << 'EOF' || true
    23 
    -if (m/targetSdkVersion:\\s+(.*)$/) {
    24 
    -  print $1;
    25 
    -  exit;
    26 
    -}
    27 
    -EOF
    28 
    -needed=$(cat .config.yml | perl -ne "$p")
    29 
    -current=33
    30 
    -check_update_needed 'targetSdkVersion [android-components]' "$needed" "$current"
    31 
    -
    32 
    -
    33 
    -# minSdkVersion
    34 
    -read -d '' p << 'EOF' || true
    35 
    -if (m/minSdkVersion:\\s+(.*)$/) {
    36 
    -  print $1;
    37 
    -  exit;
    38 
    -}
    39 
    -EOF
    40 
    -needed=$(cat .config.yml | perl -ne "$p")
    41 
    -current=21
    42 
    -check_update_needed 'minSdkVersion [android-components]' "$needed" "$current"
    43 
    -
    44 
    -
    45 
    -# gradle
    46 
    -read -d '' p << 'EOF' || true
    47 
    -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)-bin.zip|) {
    48 
    -  print $1;
    49 
    -  exit;
    50 
    -}
    51 
    -EOF
    52 
    -needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p")
    53 
    -current='[% c("var/gradle_version") %]'
    54 
    -check_update_needed 'gradle [android-components]' "$needed" "$current"
    55 
    -
    56 
    -cd ..
    57 
    -
    58 
    -
    59 
    -#############
    60 
    -### fenix ###
    61 
    -#############
    62 
    -
    63 
    -cd fenix
    64 
    -
    65 
    -# targetSdkVersion
    66 
    -read -d '' p << 'EOF' || true
    67 
    -if (m/const\\s+val\\s+targetSdkVersion\\s+=\\s+([^"]+)/) {
    68 
    -  print $1;
    69 
    -  exit;
    70 
    -}
    71 
    -EOF
    72 
    -needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p")
    73 
    -current=33
    74 
    -check_update_needed 'targetSdkVersion [fenix]' "$needed" "$current"
    75 
    -
    76 
    -
    77 
    -# compileSdkVersion
    78 
    -read -d '' p << 'EOF' || true
    79 
    -if (m/const\\s+val\\s+compileSdkVersion\\s+=\\s+([^"]+)/) {
    80 
    -  print $1;
    81 
    -  exit;
    82 
    -}
    83 
    -EOF
    84 
    -needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p")
    85 
    -current=33
    86 
    -check_update_needed 'compileSdkVersion [fenix]' "$needed" "$current"
    87 
    -
    88 
    -
    89 
    -# minSdkVersion
    90 
    -read -d '' p << 'EOF' || true
    91 
    -if (m/const\\s+val\\s+minSdkVersion\\s+=\\s+([^"]+)/) {
    92 
    -  print $1;
    93 
    -  exit;
    94 
    -}
    95 
    -EOF
    96 
    -needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p")
    97 
    -current=21
    98 
    -check_update_needed 'minSdkVersion [fenix]' "$needed" "$current"
    99 
    -
    100 
    -
    101 
    -# gradle
    102 
    -read -d '' p << 'EOF' || true
    103 
    -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)-bin.zip|) {
    104 
    -  print $1;
    105 
    -  exit;
    106 
    -}
    107 
    -EOF
    108 
    -needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p")
    109 
    -current='[% c("var/gradle_version") %]'
    110 
    -check_update_needed 'gradle [fenix]' "$needed" "$current"

  • projects/firefox-android/repos.diff deleted
    1 
    -diff -rup firefox-android-orig/android-components/buildSrc/settings.gradle firefox-android-0aa48c23b715/android-components/buildSrc/settings.gradle
    2 
    ---- firefox-android-orig/android-components/buildSrc/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    3 
    -+++ firefox-android-0aa48c23b715/android-components/buildSrc/settings.gradle	2023-07-17 09:10:40.767368326 +0000
    4 
    -@@ -2,9 +2,22 @@
    5 
    -  * License, v. 2.0. If a copy of the MPL was not distributed with this
    6 
    -  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    7 
    -
    8 
    -+pluginManagement {
    9 
    -+    repositories {
    10 
    -+        maven {
    11 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    12 
    -+            metadataSources {
    13 
    -+                gradleMetadata()
    14 
    -+                mavenPom()
    15 
    -+            }
    16 
    -+        }
    17 
    -+    }
    18 
    -+}
    19 
    -+
    20 
    -+
    21 
    - buildCache {
    22 
    -     local {
    23 
    -         directory = new File(rootDir, '../.build-cache')
    24 
    -         removeUnusedEntriesAfterDays = 30
    25 
    -     }
    26 
    --}
    27 
    -\ No newline at end of file
    28 
    -+}
    29 
    -diff -rup firefox-android-orig/android-components/plugins/dependencies/settings.gradle firefox-android-0aa48c23b715/android-components/plugins/dependencies/settings.gradle
    30 
    ---- firefox-android-orig/android-components/plugins/dependencies/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    31 
    -+++ firefox-android-0aa48c23b715/android-components/plugins/dependencies/settings.gradle	2023-07-17 08:52:28.390014297 +0000
    32 
    -@@ -3,3 +3,15 @@
    33 
    -  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    34 
    -
    35 
    - // Prevents gradle builds from looking for a root settings.gradle
    36 
    -+
    37 
    -+pluginManagement {
    38 
    -+    repositories {
    39 
    -+        maven {
    40 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    41 
    -+            metadataSources {
    42 
    -+                gradleMetadata()
    43 
    -+                mavenPom()
    44 
    -+            }
    45 
    -+        }
    46 
    -+    }
    47 
    -+}
    48 
    -diff -rup firefox-android-orig/android-components/plugins/publicsuffixlist/settings.gradle firefox-android-0aa48c23b715/android-components/plugins/publicsuffixlist/settings.gradle
    49 
    ---- firefox-android-orig/android-components/plugins/publicsuffixlist/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    50 
    -+++ firefox-android-0aa48c23b715/android-components/plugins/publicsuffixlist/settings.gradle	2023-07-17 09:12:26.821491020 +0000
    51 
    -@@ -3,3 +3,15 @@
    52 
    -  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    53 
    -
    54 
    - // Prevents gradle builds from looking for a root settings.gradle
    55 
    -+
    56 
    -+pluginManagement {
    57 
    -+    repositories {
    58 
    -+        maven {
    59 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    60 
    -+            metadataSources {
    61 
    -+                gradleMetadata()
    62 
    -+                mavenPom()
    63 
    -+            }
    64 
    -+        }
    65 
    -+    }
    66 
    -+}
    67 
    -diff -rup firefox-android-orig/android-components/settings.gradle firefox-android-0aa48c23b715/android-components/settings.gradle
    68 
    ---- firefox-android-orig/android-components/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    69 
    -+++ firefox-android-0aa48c23b715/android-components/settings.gradle	2023-07-17 08:52:04.766877399 +0000
    70 
    -@@ -3,6 +3,15 @@
    71 
    -  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    72 
    -
    73 
    - pluginManagement {
    74 
    -+    repositories {
    75 
    -+        maven {
    76 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    77 
    -+            metadataSources {
    78 
    -+                gradleMetadata()
    79 
    -+                mavenPom()
    80 
    -+            }
    81 
    -+        }
    82 
    -+    }
    83 
    -     includeBuild("plugins/dependencies")
    84 
    -     includeBuild("plugins/publicsuffixlist")
    85 
    - }
    86 
    -diff -rup firefox-android-orig/fenix/app/build.gradle firefox-android-0aa48c23b715/fenix/app/build.gradle
    87 
    ---- firefox-android-orig/fenix/app/build.gradle	2023-07-14 01:36:01.000000000 +0000
    88 
    -+++ firefox-android-0aa48c23b715/fenix/app/build.gradle	2023-07-17 11:04:32.924432356 +0000
    89 
    -@@ -898,3 +898,4 @@ android.applicationVariants.all { varian
    90 
    -
    91 
    - // Enable expiration by major version.
    92 
    - ext.gleanExpireByVersion = Config.majorVersion()
    93 
    -+ext.gleanBuildDate = "0"
    94 
    -diff -rup firefox-android-orig/fenix/buildSrc/build.gradle firefox-android-0aa48c23b715/fenix/buildSrc/build.gradle
    95 
    ---- firefox-android-orig/fenix/buildSrc/build.gradle	2023-07-14 01:36:01.000000000 +0000
    96 
    -+++ firefox-android-0aa48c23b715/fenix/buildSrc/build.gradle	2023-07-17 12:27:28.609768018 +0000
    97 
    -@@ -7,6 +7,15 @@ plugins {
    98 
    - }
    99 
    -
    100 
    - repositories {
    101 
    -+    repositories {
    102 
    -+        maven {
    103 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    104 
    -+            metadataSources {
    105 
    -+                gradleMetadata()
    106 
    -+                mavenPom()
    107 
    -+            }
    108 
    -+        }
    109 
    -+    }
    110 
    -     if (project.hasProperty("centralRepo")) {
    111 
    -         maven {
    112 
    -             name "MavenCentral"
    113 
    -diff -rup firefox-android-orig/fenix/settings.gradle firefox-android-0aa48c23b715/fenix/settings.gradle
    114 
    ---- firefox-android-orig/fenix/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    115 
    -+++ firefox-android-0aa48c23b715/fenix/settings.gradle	2023-07-17 12:26:10.479390296 +0000
    116 
    -@@ -5,6 +5,15 @@
    117 
    - pluginManagement {
    118 
    -     includeBuild("../android-components/plugins/publicsuffixlist")
    119 
    -     includeBuild("../android-components/plugins/dependencies")
    120 
    -+    repositories {
    121 
    -+        maven {
    122 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    123 
    -+            metadataSources {
    124 
    -+                gradleMetadata()
    125 
    -+                mavenPom()
    126 
    -+            }
    127 
    -+        }
    128 
    -+    }
    129 
    - }
    130 
    -
    131 
    - plugins {
    132 
    -diff -rup firefox-android-orig/focus-android/settings.gradle firefox-android-0aa48c23b715/focus-android/settings.gradle
    133 
    ---- firefox-android-orig/focus-android/settings.gradle	2023-07-14 01:36:01.000000000 +0000
    134 
    -+++ firefox-android-0aa48c23b715/focus-android/settings.gradle	2023-07-17 11:12:19.090555632 +0000
    135 
    -@@ -3,6 +3,15 @@
    136 
    -  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    137 
    -
    138 
    - pluginManagement {
    139 
    -+    repositories {
    140 
    -+        maven {
    141 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    142 
    -+            metadataSources {
    143 
    -+                gradleMetadata()
    144 
    -+                mavenPom()
    145 
    -+            }
    146 
    -+        }
    147 
    -+    }
    148 
    -     includeBuild("../android-components/plugins/publicsuffixlist")
    149 
    -     includeBuild("../android-components/plugins/dependencies")
    150 
    - }
    151 
    -diff -rup firefox-android-orig/shared-settings.gradle firefox-android-0aa48c23b715/shared-settings.gradle
    152 
    ---- firefox-android-orig/shared-settings.gradle	2023-07-14 01:36:01.000000000 +0000
    153 
    -+++ firefox-android-0aa48c23b715/shared-settings.gradle	2023-07-17 09:09:39.331186584 +0000
    154 
    -@@ -6,6 +6,13 @@ import org.yaml.snakeyaml.Yaml
    155 
    -
    156 
    - buildscript {
    157 
    -     repositories {
    158 
    -+        maven {
    159 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    160 
    -+            metadataSources {
    161 
    -+                gradleMetadata()
    162 
    -+                mavenPom()
    163 
    -+            }
    164 
    -+        }
    165 
    -         mavenCentral()
    166 
    -     }
    167 
    -
    168 
    -diff -upN firefox-android-orig/fenix/buildSrc/settings.gradle firefox-android-0aa48c23b715/fenix/buildSrc/settings.gradle
    169 
    ---- firefox-android-orig/fenix/buildSrc/settings.gradle 1970-01-01 00:00:00.000000000 +0000
    170 
    -+++ firefox-android-0aa48c23b715/fenix/buildSrc/settings.gradle 2023-07-17 12:27:39.371197488 +0000
    171 
    -@@ -0,0 +1,11 @@
    172 
    -+pluginManagement {
    173 
    -+    repositories {
    174 
    -+        maven {
    175 
    -+            url "file:///var/tmp/dist/gradle-dependencies"
    176 
    -+            metadataSources {
    177 
    -+                gradleMetadata()
    178 
    -+                mavenPom()
    179 
    -+            }
    180 
    -+        }
    181 
    -+    }
    182 
    -+}

  • projects/geckoview/build_apk
    ... ... @@ -98,6 +98,8 @@ rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv
    98 98
    99 99 
     pushd mobile/android/fenix
    100 100
    101 
    +cp -a $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar app/
    102 
    +
    101 103 
     # Use the Android Components we have just built
    102 104 
     echo autoPublish.android-components.dir=../android-components > local.properties
    103 105

  • projects/geckoview/config
    ... ... @@ -105,6 +105,9 @@ steps:
    105 105 
           - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
    106 106 
             name: glean-wheels
    107 107 
             sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
    108 
    +      - name: tor-expert-bundle-aar
    109 
    +        project: tor-expert-bundle-aar
    110 
    +        pkg_type: build
    108 111
    109 112 
       list_toolchain_updates:
    110 113 
         git_hash: tor-browser-128.0b1-14.0-1

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits