commit 3cddd2eec63aa7cea5e43d121317de66d03c6f82 Author: Georg Koppen gk@torproject.org Date: Fri Oct 2 08:51:54 2020 +0000

Bug 40085: Make classes.dex reproducible

Updating glean_parser to 1.28.6 fixes the remaining part of #40086 as well. --- projects/android-components/40085.patch | 22 ++++++++++++++++++++++ projects/android-components/build | 3 +++ projects/android-components/config | 7 +++++-- .../gradle-dependencies-list.txt | 13 ++++++------- projects/fenix/config | 6 ++++-- projects/fenix/gradle-dependencies-list.txt | 12 ++++++------ 6 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/projects/android-components/40085.patch b/projects/android-components/40085.patch new file mode 100644 index 0000000..eb1a29d --- /dev/null +++ b/projects/android-components/40085.patch @@ -0,0 +1,22 @@ +From efa26eaf4fba939c3e43b659e5c77a57b22b270a Mon Sep 17 00:00:00 2001 +From: Georg Koppen gk@torproject.org +Date: Fri, 2 Oct 2020 08:48:49 +0000 +Subject: [PATCH] Update glean for tor-browser-build#40085 + + +diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt +index f4063f7ad..245d14447 100644 +--- a/buildSrc/src/main/java/Dependencies.kt ++++ b/buildSrc/src/main/java/Dependencies.kt +@@ -29,7 +29,7 @@ object Versions { + + const val mozilla_appservices = "61.0.13" + +- const val mozilla_glean = "32.1.1" ++ const val mozilla_glean = "32.4.1" + + const val material = "1.1.0" + const val nearby = "17.0.0" +-- +2.28.0 + diff --git a/projects/android-components/build b/projects/android-components/build index 43016b0..e0d727a 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -27,6 +27,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

cd $builddir-[% c('version') %] patch -p1 < $rootdir/git.patch +# We need to pick up a newer glean_parser until an updates glean lands in +# android-components. +patch -p1 < $rootdir/40085.patch [% IF c("var/fetch_gradle_dependencies") %] # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # results in some missing dependencies for yet unknown reasons. Thus, we use diff --git a/projects/android-components/config b/projects/android-components/config index 1093a07..0424b03 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -12,9 +12,11 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 + # Overwrite `glean_parser` for now to fix #40085. + glean_parser: 1.28.6

targets: nightly: @@ -42,6 +44,7 @@ input_files: - filename: git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' + - filename: 40085.patch - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-%5B% c('var/glean_parser') %].tar.bz2 - sha256sum: 69234aa1ae38fd5dda4de71bd5e536795073703c3ed5bb994b9b8485bd7a55dc + sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index c0db10e..ff3b587 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -434,13 +434,12 @@ e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven 41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82.... b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.202009... e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.202009... -99c418afb9003150afea443057f0c859868045279d356dd5b808baf136b7dc0e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... -8e5b9b3ba3570ecf5d22ea08f762465bef048271dab6fd7a07f5a51f0eeaff33 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... -ab514359d7686282b7a7c8463e81237ff98460a23df534a6c9663b463e65423f | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -f724de3fc1c37d8ecb4bbb7957dd67a489d0321da71eebb6b8d605ec4a57755a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -13739196d0331ece885a74189c80feb034d746283b78afa8a8ea2620a7926d7b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/21.3.0/glean-21... -5b078e136164082be6d49afa0d87f849c7b9f65e21125fa57056cd630756279b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-32... -64371d71a4fb11d63d2a5ff60149c94c1d0e0b909de09ffe199f6872663976b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-32... +acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... +71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... +93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +a84340369fdbb4c38ea0ce2e17ceac1c6a596cebb9818885276eec8b611e4d4b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +d0e02f22fbd35b15e50e043ca0462fac6b2b78ac4968b324bd1431c8f85878df | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32... +79d0b2e02aa86ef38577edb2befa25280ce58fcbae23a1ffd1db80147510aa86 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32... 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-pa... 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom diff --git a/projects/fenix/config b/projects/fenix/config index a3d0b73..4d9c936 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,9 +14,11 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 5 + gradle_dependencies_version: 6 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 + # Overwrite `glean_parser` for now to fix #40085. + glean_parser: 1.28.6

targets: nightly: @@ -46,7 +48,7 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-%5B% c('var/glean_parser') %].tar.bz2 - sha256sum: 69234aa1ae38fd5dda4de71bd5e536795073703c3ed5bb994b9b8485bd7a55dc + sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index fa7c80f..1a84cab 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -1074,12 +1074,12 @@ e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven 41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82.... b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.202009... e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.202009... -99c418afb9003150afea443057f0c859868045279d356dd5b808baf136b7dc0e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... -8e5b9b3ba3570ecf5d22ea08f762465bef048271dab6fd7a07f5a51f0eeaff33 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... -ab514359d7686282b7a7c8463e81237ff98460a23df534a6c9663b463e65423f | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -f724de3fc1c37d8ecb4bbb7957dd67a489d0321da71eebb6b8d605ec4a57755a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -5b078e136164082be6d49afa0d87f849c7b9f65e21125fa57056cd630756279b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-32... -64371d71a4fb11d63d2a5ff60149c94c1d0e0b909de09ffe199f6872663976b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-32... +acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... +71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32... +93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +a84340369fdbb4c38ea0ce2e17ceac1c6a596cebb9818885276eec8b611e4d4b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +d0e02f22fbd35b15e50e043ca0462fac6b2b78ac4968b324bd1431c8f85878df | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32... +79d0b2e02aa86ef38577edb2befa25280ce58fcbae23a1ffd1db80147510aa86 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32... 470564ff0a452da1c96be4ca3a9cdeceaa2912537ee2a8def486f3b383d43f15 | https://plugins.gradle.org/m2/com/jetbrains/python/envs/com.jetbrains.python... 6438812f927b505a4c4ef2703b45433a1b99e45334526bfed25e71e1a79abb14 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyth... 317aa4c467a37d5fcab6657c326a4069ea8e8c6dda951ec2091ffb95c596a2a3 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyth...