brizental pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
6100c67a
by Beatriz Rizental at 2025-08-21T14:41:56+02:00
5 changed files:
- Makefile
- projects/geckoview/build_common
- projects/geckoview/config
- projects/geckoview/gradle-dependencies-list.txt
- projects/glean/config
Changes:
| ... | ... | @@ -647,6 +647,9 @@ cargo_vendor-lox: submodule-update |
| 647 | 647 | cargo_vendor-uniffi-rs: submodule-update
|
| 648 | 648 | $(rbm) build uniffi-rs --step cargo_vendor --target alpha --target torbrowser-linux-x86_64
|
| 649 | 649 | |
| 650 | +cargo_vendor-glean: submodule-update
|
|
| 651 | + $(rbm) build glean --step cargo_vendor --target alpha --target torbrowser-linux-x86_64
|
|
| 652 | + |
|
| 650 | 653 | go_vendor-conjure: submodule-update
|
| 651 | 654 | $(rbm) build conjure --step go_vendor --target alpha --target torbrowser-linux-x86_64
|
| 652 | 655 |
| ... | ... | @@ -14,6 +14,7 @@ export PATH="/var/tmp/dist/node/bin:$PATH" |
| 14 | 14 | export LC_ALL=C.UTF-8
|
| 15 | 15 | export LANG=C.UTF-8
|
| 16 | 16 | |
| 17 | +tar -xf [% c('input_files_by_name/glean') %]
|
|
| 17 | 18 | tar -xf [% c('input_files_by_name/application-services') %]
|
| 18 | 19 | export NIMBUS_FML=$rootdir/application-services/nimbus-fml
|
| 19 | 20 | |
| ... | ... | @@ -34,6 +35,7 @@ export GRADLE_FLAGS="--no-daemon --offline -Dmaven.repo.local=$distdir/[% projec |
| 34 | 35 | # standardized for reproducibility.
|
| 35 | 36 | mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
|
| 36 | 37 | cp -rl $rootdir/application-services/maven/* $gradle_repo
|
| 38 | +cp -rl $rootdir/glean/maven/* $gradle_repo
|
|
| 37 | 39 | cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true
|
| 38 | 40 | cp -rl $gradle_repo/m2/* $gradle_repo || true
|
| 39 | 41 | cp -rl $gradle_repo/maven2/* $gradle_repo || true
|
| ... | ... | @@ -37,7 +37,7 @@ var: |
| 37 | 37 | - openjdk-17-jdk-headless
|
| 38 | 38 | # this should be updated when the list of gradle dependencies is changed
|
| 39 | 39 | # see doc/how-to-create-gradle-dependencies-list.txt
|
| 40 | - gradle_dependencies_version: 17
|
|
| 40 | + gradle_dependencies_version: 18
|
|
| 41 | 41 | gradle_version: 8.13
|
| 42 | 42 | glean_parser: 14.0.1
|
| 43 | 43 | # python/mozboot/mozboot/android.py
|
| ... | ... | @@ -77,6 +77,9 @@ steps: |
| 77 | 77 | - project: application-services
|
| 78 | 78 | name: application-services
|
| 79 | 79 | pkg_type: build
|
| 80 | + - project: glean
|
|
| 81 | + name: glean
|
|
| 82 | + pkg_type: build
|
|
| 80 | 83 | - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
|
| 81 | 84 | name: gradle-dependencies
|
| 82 | 85 | exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
|
| ... | ... | @@ -162,6 +165,9 @@ input_files: |
| 162 | 165 | - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'
|
| 163 | 166 | name: glean-wheels
|
| 164 | 167 | sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'
|
| 168 | + - project: glean
|
|
| 169 | + name: glean
|
|
| 170 | + pkg_type: build
|
|
| 165 | 171 | - project: oss-licenses-plugin
|
| 166 | 172 | name: oss-licenses-plugin
|
| 167 | 173 | - name: tor-expert-bundle-aar
|
| ... | ... | @@ -1023,12 +1023,6 @@ dba74d6bf94647ee397bf7afb2ab07f6fe8d13157e56785fa540a2a13ed82c99 | https://maven |
| 1023 | 1023 | d36f248782d4ab513d2ab2b6141799525211c37ba0941c4aa2e73ee00f1a14b2 | https://maven.google.com/com/google/firebase/firebase-messaging/24.1.1/firebase-messaging-24.1.1.pom
|
| 1024 | 1024 | d001eb0ccbbfc8cb9eaa193a358e63712974639775647be949ab232c2b29b407 | https://maven.google.com/com/google/testing/platform/core-proto/0.0.9-alpha03/core-proto-0.0.9-alpha03.jar
|
| 1025 | 1025 | 3bb45280df1dd1c96b9a01724a614566b7d60d33453fcd52c2c741f9999c3a4e | https://maven.google.com/com/google/testing/platform/core-proto/0.0.9-alpha03/core-proto-0.0.9-alpha03.pom
|
| 1026 | -7d66a1b1e51592eda1e77c44d5692192dbffc828ea3899ff92ae0161b681a336 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/64.3.1/glean-gradle-plugin-64.3.1.jar
|
|
| 1027 | -07742881a447c577669139ed7548fc4a0e6c43c63aa28a6f4652ff2d163b94f6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/64.3.1/glean-gradle-plugin-64.3.1.pom
|
|
| 1028 | -79aa542e883553436721d40af661beb9ac09dad323b89afde057631c54fdf83c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/glean-native-64.3.1.aar
|
|
| 1029 | -17ae368dcc12a965df8a9195e5d897fb70400159a87effcf65ee5c05790f814e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/64.3.1/glean-native-64.3.1.pom
|
|
| 1030 | -cb1c7a04874d97c6bb1d3ba4ce009e1fde5f46225b45f6bb87559328573b530b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-64.3.1.aar
|
|
| 1031 | -5792a08566c294a46ea777939819154a945eeee8d5cb47d391f845d7c711013a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/64.3.1/glean-64.3.1.pom
|
|
| 1032 | 1026 | 243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92 | https://plugins.gradle.org/m2/com/almworks/sqlite4java/sqlite4java/1.0.392/sqlite4java-1.0.392.jar
|
| 1033 | 1027 | 139552c586a57bf6d98f87d6b7e23fef4db53cf74097be962f7868e3606c79d2 | https://plugins.gradle.org/m2/com/almworks/sqlite4java/sqlite4java/1.0.392/sqlite4java-1.0.392.pom
|
| 1034 | 1028 | 02a5b08a2b35d2d58eb2eaca9d84ac00fb341da725fdbd653ea3ed130437e95a | https://plugins.gradle.org/m2/com/caverock/androidsvg-aar/1.4/androidsvg-aar-1.4.aar
|
| ... | ... | @@ -12,35 +12,37 @@ var: |
| 12 | 12 | gradle_dependencies_version: 1
|
| 13 | 13 | gradle_version: 8.13
|
| 14 | 14 | |
| 15 | -input_files:
|
|
| 16 | - - project: container-image
|
|
| 17 | - - project: '[% c("var/compiler") %]'
|
|
| 18 | - name: '[% c("var/compiler") %]'
|
|
| 19 | - # These versions of build tools and platform are not the same version needed
|
|
| 20 | - # by our other projects, therefore we download it only here instead of modifying
|
|
| 21 | - # the android-toolchain project.
|
|
| 22 | - - URL: 'https://dl.google.com/android/repository/build-tools_r35_linux.zip'
|
|
| 23 | - name: build_tools_35
|
|
| 24 | - sha256sum: bd3a4966912eb8b30ed0d00b0cda6b6543b949d5ffe00bea54c04c81e1561d88
|
|
| 25 | - - URL: 'https://dl.google.com/android/repository/platform-35_r02.zip'
|
|
| 26 | - name: platform_35
|
|
| 27 | - sha256sum: 0988cacad01b38a18a47bac14a0695f246bc76c1b06c0eeb8eb0dc825ab0c8e0
|
|
| 28 | - - project: gradle
|
|
| 29 | - name: gradle
|
|
| 30 | - - project: rust
|
|
| 31 | - name: rust
|
|
| 32 | - - project: uniffi-rs
|
|
| 33 | - name: uniffi-rs
|
|
| 34 | - - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'
|
|
| 35 | - name: glean-wheels
|
|
| 36 | - sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'
|
|
| 37 | - - name: cargo_vendor
|
|
| 38 | - project: glean
|
|
| 39 | - pkg_type: cargo_vendor
|
|
| 40 | - norec:
|
|
| 41 | - sha256sum: 0cb6a7093b93ecc8d8e13f02e5ec46a538b5eaf55ab027b46754bfbdeec2152e
|
|
| 42 | - - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
|
|
| 43 | - name: gradle-dependencies
|
|
| 44 | - exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
|
|
| 45 | - - filename: use-custom-gradle-repo.diff
|
|
| 46 | - - filename: use-uniffi-noop.diff |
|
| 15 | +steps:
|
|
| 16 | + build:
|
|
| 17 | + input_files:
|
|
| 18 | + - project: container-image
|
|
| 19 | + - project: '[% c("var/compiler") %]'
|
|
| 20 | + name: '[% c("var/compiler") %]'
|
|
| 21 | + # These versions of build tools and platform are not the same version needed
|
|
| 22 | + # by our other projects, therefore we download it only here instead of modifying
|
|
| 23 | + # the android-toolchain project.
|
|
| 24 | + - URL: 'https://dl.google.com/android/repository/build-tools_r35_linux.zip'
|
|
| 25 | + name: build_tools_35
|
|
| 26 | + sha256sum: bd3a4966912eb8b30ed0d00b0cda6b6543b949d5ffe00bea54c04c81e1561d88
|
|
| 27 | + - URL: 'https://dl.google.com/android/repository/platform-35_r02.zip'
|
|
| 28 | + name: platform_35
|
|
| 29 | + sha256sum: 0988cacad01b38a18a47bac14a0695f246bc76c1b06c0eeb8eb0dc825ab0c8e0
|
|
| 30 | + - project: gradle
|
|
| 31 | + name: gradle
|
|
| 32 | + - project: rust
|
|
| 33 | + name: rust
|
|
| 34 | + - project: uniffi-rs
|
|
| 35 | + name: uniffi-rs
|
|
| 36 | + - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'
|
|
| 37 | + name: glean-wheels
|
|
| 38 | + sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'
|
|
| 39 | + - name: cargo_vendor
|
|
| 40 | + project: glean
|
|
| 41 | + pkg_type: cargo_vendor
|
|
| 42 | + norec:
|
|
| 43 | + sha256sum: 0cb6a7093b93ecc8d8e13f02e5ec46a538b5eaf55ab027b46754bfbdeec2152e
|
|
| 44 | + - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
|
|
| 45 | + name: gradle-dependencies
|
|
| 46 | + exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
|
|
| 47 | + - filename: use-custom-gradle-repo.diff
|
|
| 48 | + - filename: use-uniffi-noop.diff |