GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Unverified Commit 8efcab70 authored by Matthew Finkel's avatar Matthew Finkel

Merge remote-tracking branch 'gkgl/bug_40115_v6'

parents a86e9f9c 4338d3dc
From efa26eaf4fba939c3e43b659e5c77a57b22b270a Mon Sep 17 00:00:00 2001 From 581a25d6dd543e56cb0d3291031818acac28999b Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org> From: Georg Koppen <gk@torproject.org>
Date: Fri, 2 Oct 2020 08:48:49 +0000 Date: Thu, 8 Oct 2020 08:22:52 +0000
Subject: [PATCH] Update glean for tor-browser-build#40085 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 diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index f4063f7ad..245d14447 100644 index cb56fbbcf..3d9580f51 100644
--- a/buildSrc/src/main/java/Dependencies.kt --- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt
@@ -29,7 +29,7 @@ object Versions { @@ -29,7 +29,7 @@ object Versions {
const val mozilla_appservices = "61.0.13" const val mozilla_appservices = "63.0.0"
- const val mozilla_glean = "32.1.1" - const val mozilla_glean = "32.4.0"
+ const val mozilla_glean = "32.4.1" + const val mozilla_glean = "32.4.1"
const val material = "1.1.0" const val material = "1.1.0"
......
...@@ -14,11 +14,10 @@ EOF ...@@ -14,11 +14,10 @@ EOF
[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] tar -C $distdir -xf [% c('input_files_by_name/geckoview') %]
gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
# This overwrites the release and beta geckoview .aar files in our # This overwrites the release, beta, and nightly geckoview .aar files in our
# gradle-dependencies directory to be sure that only the one we provide is # gradle-dependencies directory to be sure that only the one we provide is
# getting used when building beta/release code. XXX: Find a way to make that # getting used when building beta/release code.
# work for nightly, too. find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} \;
find $gradle_repo -type f \( -name geckoview-[^a-z]*.aar -o -name geckoview-beta*.aar \) -exec cp -f $distdir/geckoview/geckoview*.aar {} \;
cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo
cp -r $gradle_repo/m2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo
...@@ -38,7 +37,7 @@ patch -p1 < $rootdir/40085.patch ...@@ -38,7 +37,7 @@ patch -p1 < $rootdir/40085.patch
# XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target
# results in some missing dependencies for yet unknown reasons. Thus, we use # results in some missing dependencies for yet unknown reasons. Thus, we use
# `assemble` instead for now. # `assemble` instead for now.
gradle --debug -no-daemon assemble gradle --debug --no-daemon assemble
[% ELSE %] [% ELSE %]
# Prepare Glean dependencies for offline build # Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
...@@ -55,8 +54,19 @@ patch -p1 < $rootdir/40085.patch ...@@ -55,8 +54,19 @@ patch -p1 < $rootdir/40085.patch
exit 1 exit 1
fi fi
# We want to make sure only our code is built. Overwrite engine-gecko code we
# don't need. XXX: Take release into account.
cd components/browser
[% IF c("var/alpha") || c("var/nightly") %]
rm -rf engine-gecko/src/*
rm -rf engine-gecko-nightly/src/*
cp -rf engine-gecko-beta/src/* engine-gecko/src/
cp -rf engine-gecko-beta/src/* engine-gecko-nightly/src/
[% END %]
cd ../../
gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
# XXX: Take release into account
gradle $gradle_args assembleGeckoBeta -x lint gradle $gradle_args assembleGeckoBeta -x lint
gradle $gradle_args publish gradle $gradle_args publish
......
...@@ -7,12 +7,12 @@ tag_gpg_id: 1 ...@@ -7,12 +7,12 @@ tag_gpg_id: 1
gpg_keyring: torbutton.gpg gpg_keyring: torbutton.gpg
var: var:
android_components_version: 57.0.7 android_components_version: 60.0.3
torbrowser_branch: 10.0 torbrowser_branch: 10.0
container: container:
use_container: 1 use_container: 1
# This should be updated when the list of gradle dependencies is changed. # 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. # Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0 fetch_gradle_dependencies: 0
# Overwrite `glean_parser` for now to fix #40085. # Overwrite `glean_parser` for now to fix #40085.
...@@ -20,7 +20,7 @@ var: ...@@ -20,7 +20,7 @@ var:
targets: targets:
nightly: nightly:
git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0 tag_gpg_id: 0
input_files: input_files:
......
From a77b847b6451c598176137b944edf27e6e7202a2 Mon Sep 17 00:00:00 2001 From 96fc057633a96188e00a55a0abc28a19d9b1dcf9 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org> From: Georg Koppen <gk@torproject.org>
Date: Sun, 19 Apr 2020 17:59:16 +0000 Date: Sun, 19 Apr 2020 17:59:16 +0000
Subject: [PATCH 1/5] git patch Subject: [PATCH] git patch
diff --git a/components/support/base/build.gradle b/components/support/base/build.gradle diff --git a/components/support/base/build.gradle b/components/support/base/build.gradle
index aa4c1b005..4318f1334 100644 index 094c85e44..1b46c1b84 100644
--- a/components/support/base/build.gradle --- a/components/support/base/build.gradle
+++ b/components/support/base/build.gradle +++ b/components/support/base/build.gradle
@@ -37,7 +37,7 @@ android { @@ -38,7 +38,7 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
...@@ -17,6 +17,19 @@ index aa4c1b005..4318f1334 100644 ...@@ -17,6 +17,19 @@ index aa4c1b005..4318f1334 100644
} }
} }
diff --git a/publish.gradle b/publish.gradle
index 09280f51f..14da5a6c0 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -61,7 +61,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg ->
connection = libVcsUrl
developerConnection = libVcsUrl
url = libUrl
- tag = getGitHash()
+ tag = "release build"
}
}
}
-- --
2.27.0.rc0 2.28.0
...@@ -392,48 +392,46 @@ e3856758c3bb08b7c97ddcd493521c5e0bd0741717c93b292bf1a541513af082 | https://jcent ...@@ -392,48 +392,46 @@ e3856758c3bb08b7c97ddcd493521c5e0bd0741717c93b292bf1a541513af082 | https://jcent
b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar 13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar
1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom 1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom
d4ab91af367123a2f1345e8f1a8ff0900bba9e24918479fb3f48459c86799533 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/61.0.13/full-megazord-forUnitTests-61.0.13.jar 3520e710bea6a79317db7ffcba1ab03e54696dc154550d7101220adb329232b5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/63.0.0/full-megazord-forUnitTests-63.0.0.jar
369a6635f8cb0f6e8e1c9149900903f7deb47c226b67befaae6aedd84c87f724 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/61.0.13/full-megazord-forUnitTests-61.0.13.pom bbfc48708d67383ffeb65ff20416b0477e378edb8319c6e8802c887f12a27333 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forUnitTests/63.0.0/full-megazord-forUnitTests-63.0.0.pom
710686da2a7d4a45c8e1a916d7f994730af8ef5851714fd926772976ac1cfc1c | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/61.0.13/full-megazord-61.0.13.aar 032545e2abad022bac2192d9c11bba9439f954b5c939a1b15d8fb9d78aeb3bc5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0.0/full-megazord-63.0.0.aar
58f3553ea92ced0a746b25edbd7ace112a1b95da9f3532c97ad180861011dcc5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/61.0.13/full-megazord-61.0.13.pom ede284cc085fde78fb2650cb48a0bb537272cf76425eeeaf76b44309aa8ac1b4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0.0/full-megazord-63.0.0.pom
05bc9d4f437f9f66e82312c25b66c8b98ff5e9763e66852ed9006f409395b0fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/61.0.13/fxaclient-61.0.13.aar d32cf0439223b97424243d4516b044301494f698e17d80c44241e19c97423f5f | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/fxaclient-63.0.0.aar
245d0d1d208955ccaf8eb024fc656d3a4e58714728f3b808698f839f954f8777 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/61.0.13/fxaclient-61.0.13.pom 9d35aecc1770669c5a253749212a254fca379f40f87eda8e38b53a210ec4bdca | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/fxaclient-63.0.0.pom
6aaead9440159e47921df63daff7e126a1679d6dd8ffddd8ac27c3038a175089 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/61.0.13/httpconfig-61.0.13.aar e879e577aba4210949e4b10eb4013f451c270c6d174c61ff518933812ed1cefa | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/httpconfig-63.0.0.aar
1c3a2f89320adbca73db7654782b05e3dc9a1819dbbed5acea3529bfec8d6834 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/61.0.13/httpconfig-61.0.13.pom 642ab85c85ef07bbac292638935f5db527ca457ac98862fe60821a4f246cab8a | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/httpconfig-63.0.0.pom
9572bdf0cf07a390cb7fe125a4062827ef18ebfdb9cecc2a229ac7bab1045c24 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/61.0.13/logins-61.0.13.aar 6dc4870a15a866112e0fd960f9a14be6c65ea1ae7b85f18e0fd08f8001a13881 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logins-63.0.0.aar
5625532e701bf641fbec212eb8b389844c5687b656c5ad8309a797e9222e07b7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/61.0.13/logins-61.0.13.pom 06e78f40e5c2db1e6bcb275b5d2b2c26f83b1f096e88273c2c11819f9f4db1e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logins-63.0.0.pom
0ac0b96af98726e54c97b7aa2b52d2205c05e6edd0c8c88279e21798f8c49c41 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/61.0.13/native-support-61.0.13.aar e31ec1cc55287f27e6eac65e31aff5306df5667ba35e7e0b90e5530c9d5e2ddc | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.0.0/native-support-63.0.0.aar
bbc378284b26da3f33309a94c68a8ef8856cc8cce39b41ba203955f747c36729 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/61.0.13/native-support-61.0.13.pom 68c16f560c397b55e46b6a46791391452f4c4212b720627c440f36c8d25f11a3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.0.0/native-support-63.0.0.pom
39e1e04e6cae9f1d3d77f028eb5a63340368b58c5c4266b3e9134b25052f3f4f | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/61.0.13/places-61.0.13.aar 9ae67ef84b6b9c1f446f98b4d08e18a82fa8d1222e708ef3043cdc841cc08aaa | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/places-63.0.0.aar
3ec1d8818b70dfd0661a6ce8931bd950dc728dc7ef9c407cc76a353198159552 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/61.0.13/places-61.0.13.pom c864a036385df7254d11e8c92fc78cf7e4f18ba64fc175aa7a641eb7eb997b0b | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/places-63.0.0.pom
cfa58458b1d04eaad4adfc558edc74ffc6d6308edc72243683cd6de2052ea0e0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/61.0.13/push-61.0.13.aar 8f1a4aa9adef85c557f831c65ffb6fe7d3a3b20d09303f753799628f8d138644 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-63.0.0.aar
6d08d646a02949933f1ed892386701dc51a38c6ae3ad683c13f461d3e970d39f | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/61.0.13/push-61.0.13.pom b87499e129d7bcfd13ad228ef131b16bd4d83f4566a208555a3004194c9cef9b | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-63.0.0.pom
94a93c5b9d321ce72acd07951d0d3f9f645847fceca357f26168d625a8c32365 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/61.0.13/rustlog-61.0.13.aar 77a6a0f3ec7b2d9f0dec6476ef8dd930bbd403829bc4f73eca6100b9834f5d7f | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rustlog-63.0.0.aar
5199a72884153b65b8b1c0cc9f6f3925ee09184be2fac3a5888935b8d64d6a7e | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/61.0.13/rustlog-61.0.13.pom 5341bf383990d4cbeb19b6cb972f65f30050ac9c73558ab94018a98fff4811b3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rustlog-63.0.0.pom
a318804a6d52b0431dbb23f0643101e56f73d0c04d906f3e75e9373257899b01 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/61.0.13/sync15-61.0.13.aar d583c72e82c4dc62c0ee4140e2c7e253e609c890f1c8c7dda5fb7ae726c04479 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync15-63.0.0.aar
b8740d75ff31c0402f8b75edd26046ddb1c6dcb28e880366b00227d8ec7e1d4b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/61.0.13/sync15-61.0.13.pom 1ff2d3d757cd63f6b240b7ed5604810f70e97bdb5f314f8600a3f443be97cf8e | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync15-63.0.0.pom
7f43407000d5faa6c409ee2cd69b21c66e1961b1fd151607f6808a6ba07b1405 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/61.0.13/syncmanager-61.0.13.aar 83bff9bafc078bb36ac3cf0db9d1ec1fcebc5aefb4ab2f76e5bcdf35752cf5d6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0/syncmanager-63.0.0.aar
54d1a69f5a00b84bd4bf61ef024e73371b13c2b57c31ebcd6cf7581b18267e3b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/61.0.13/syncmanager-61.0.13.pom 7cc2954d065c14e1a7cb49f8a4fb9b330f76c4ebc625d50f8a00d53e5f74bbbe | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0/syncmanager-63.0.0.pom
b509686c9eb57b4a89b6ad5482ce99221a41ec8de410427d6a90bc6fc1a8315a | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-61.0.13.aar 53f24189f0cff54e7b4937b6fd1e990b1ff8d9a52e8cc2b254852dabe08d1903 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-63.0.0.aar
0cfa4b1f7e0da13288a81551aafabb7429990957451937c7c1a747f8c7cf22a4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-61.0.13.pom a35dd95abca6750f590232a723f177c499b98c9640735ab1ab660327a4d0e3b1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-63.0.0.pom
bea33339616250107cddcb692f182a1ebce4a33b0c9b103351433688587f31d1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/24.0.0/concept-fetch-24.0.0.aar e14c614b65ae4fe6c6d26ce369d523cf1ff837ce697e5e3f47e8cdfa355357f9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.0/concept-fetch-56.0.0.aar
0f856b0f4cc29a551ffd0e65e7e53ab022a4adc1e8067c67fdcb65cc8cef2fbe | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/24.0.0/concept-fetch-24.0.0.pom e7bd7b2e2013a080bcb3cb9db974185eb28dd87c0594394f951a51ab5d6fcf5d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.0/concept-fetch-56.0.0.pom
e79c14fd4463a263a481191fcb4332db47cc8abc64e47ca5637c9bd91f7d87e9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlconnection/24.0.0/lib-fetch-httpurlconnection-24.0.0.aar e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.0/service-glean-56.0.0.aar
f030aabb57b0b6da86e0cdb0be073c190016d3abe6dacb2f070d42c00f269ce0 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlconnection/24.0.0/lib-fetch-httpurlconnection-24.0.0.pom 32acc51221752051a03765ac0bbf26a1da663ba2f7b3fe69ae422d5aac228f81 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.0/service-glean-56.0.0.pom
14205f412218ba5c8c05a1c5713fff564b22436b88d5182ebab959afd1c93f75 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/24.0.0/service-glean-24.0.0.aar ae35db5670efe458d3b9646cab337f2f7667becacdb023b599cc62bfa95b59ec | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0/support-base-56.0.0.aar
f3ce16a38f1b0ef7fbabd2bf25cff54e64a03dcfceb7de96fce7c780e2f58a69 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/24.0.0/service-glean-24.0.0.pom d87cd2eea092430c4e5a95ff04c3213be89f54aa61c2c7f80fb6548e6dc38bab | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0/support-base-56.0.0.pom
14e92790f570624d65a7e43b00d08d6cefd822d3586b4ec836691b1187504640 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/24.0.0/support-base-24.0.0.aar 96aeede35017fd79576c5faa1cb41efc8137616e20231b41934999ca711f4407 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/support-ktx-56.0.0.aar
14fdad3d3b00cc5a43c106b723d2448064d111d4c9ba473fbe60515977c9424d | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/24.0.0/support-base-24.0.0.pom dbd706151fe820ed233792a6773b70efcceb42987c209e27575ef91d4552b8c4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/support-ktx-56.0.0.pom
d69cc02f0b0a8d53bf425e97b8ac3b9ec932b549717750172316325284f8d094 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/24.0.0/support-ktx-24.0.0.aar 22934a560b0bc34f01304efbdccc988d2e0fca039ae577894fcec52a7fdfd88e | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.0/support-utils-56.0.0.aar
7bd257231ba2e0d5aa03e92a4c26f88a09c05e21043abf18dc0f47720e35c415 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/24.0.0/support-ktx-24.0.0.pom a2c1e39e5e58f585c2908af2266953b6b43e51f2fabe45e7723bc177c9c49bc0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.0/support-utils-56.0.0.pom
a05be676278b6e176ae8d3801bd4d0ebcf77bc81411f25f1d059b713d5ca9da7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/24.0.0/support-utils-24.0.0.aar f399bb05c62897849291f58296554844fdcb6dafe7ba355a6bfa61ad9deadeac | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/82.0.20201002191150/geckoview-beta-82.0.20201002191150.aar
8ca4bae0f6d2b165d6d92ac4af4321bcec0bcd4cd72b0bf9921d8abd966a42f1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/24.0.0/support-utils-24.0.0.pom cd3e8717a958c523bf06b974e2241a0ef5fac26043bb571ea7ad2d2db630d8c2 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/82.0.20201002191150/geckoview-beta-82.0.20201002191150.pom
dbc48baf933d7e57eaf7f50c1fabb4c45ecabd0a8bd7a21f5533ab05d1b821d8 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.20200910180444/geckoview-beta-81.0.20200910180444.aar 593eec7ce486e9ab552f686a4fb4ba9fb96ff8a5ec0f58176fa839e5cca27758 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/83.0.20200922094538/geckoview-nightly-83.0.20200922094538.aar
3fe97c6a7bf5bb85cd85f1b2b732bece663fce5a87e4406f95334b9c866f3e20 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.20200910180444/geckoview-beta-81.0.20200910180444.pom 2c2688dc22a1961a99ac7f14185354ba2e9239bb284f19285fc70ddd89b63cd3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/83.0.20200922094538/geckoview-nightly-83.0.20200922094538.pom
e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82.0.20200831091558/geckoview-nightly-82.0.20200831091558.aar b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200917005511/geckoview-81.0.20200917005511.aar
41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82.0.20200831091558/geckoview-nightly-82.0.20200831091558.pom e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200917005511/geckoview-81.0.20200917005511.pom
f654485c119c284c7e8132154753e11089254ef27b47abe880e4830abe0bf804 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200930150533/geckoview-81.0.20200930150533.aar
9aee6e0f93d25b480c8bce9720f6e9ef73d0e866b1eddf68492805f021076bb3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200930150533/geckoview-81.0.20200930150533.pom
acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32.4.1/glean-forUnitTests-32.4.1.jar acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32.4.1/glean-forUnitTests-32.4.1.jar
71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32.4.1/glean-forUnitTests-32.4.1.pom 71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/32.4.1/glean-forUnitTests-32.4.1.pom
93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/32.4.1/glean-gradle-plugin-32.4.1.jar 93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/32.4.1/glean-gradle-plugin-32.4.1.jar
......
This diff is collapsed.
From 1818764e69145839ab33a2f885139ea320f2283f Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Wed, 26 Aug 2020 15:56:49 +0000
Subject: [PATCH] 1651662
diff --git a/build.gradle b/build.gradle
index 58a4ddae..c6e0be82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
ext.kotlin_version = '1.3.71'
ext.jna_version = '5.2.0'
ext.android_gradle_plugin_version = '3.6.0'
- ext.android_components_version = '47.0.0'
+ ext.android_components_version = '56.0.0'
ext.build = [
ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile.
--
2.28.0
...@@ -82,8 +82,6 @@ patch -p1 < $rootdir/no-git.patch ...@@ -82,8 +82,6 @@ patch -p1 < $rootdir/no-git.patch
# XXX: We don't build the code for Linux for now as this involves additional # XXX: We don't build the code for Linux for now as this involves additional
# complexity. That's needed for running unit tests later on, though. # complexity. That's needed for running unit tests later on, though.
patch -p1 < $rootdir/target.patch patch -p1 < $rootdir/target.patch
patch -p1 < $rootdir/1651660.patch
patch -p1 < $rootdir/1651662.patch
[% IF c('var/fetch_gradle_dependencies') %] [% IF c('var/fetch_gradle_dependencies') %]
# XXX: `assemble` is still not enough to see all fetched dependencies via # XXX: `assemble` is still not enough to see all fetched dependencies via
# Gradle's --debug. See: tor-browser-build#40056. # Gradle's --debug. See: tor-browser-build#40056.
...@@ -97,25 +95,12 @@ patch -p1 < $rootdir/1651662.patch ...@@ -97,25 +95,12 @@ patch -p1 < $rootdir/1651662.patch
export LANG=C.UTF-8 export LANG=C.UTF-8
patch -p1 < $rootdir/mavenLocal.patch patch -p1 < $rootdir/mavenLocal.patch
gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
patch -p1 < $rootdir/lto.patch
# Set the right flags for cross-language LTO and override linking opt level, since
# lld does not understand -Os or -Oz.
export RUSTFLAGS="-Clinker-plugin-lto -Clink-arg=-fuse-ld=lld -Clink-arg=-Wl,-plugin-opt=O2"
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish
cd build cd build
find maven -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \; find maven -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \;
# Verify that the compiled libs do not have libc networking symbols
# (list adapted from https://searchfox.org/mozilla-central/rev/30e70f2fe80c97bfbfcd975e68538cefd7f58b2a/python/mozbuild/mozbuild/action/check_binary.py#217)
tmpdir=$(mktemp -d)
find $distdir -name '*.aar' -exec mkdir -p $tmpdir/{} \; -exec unzip {} -d $tmpdir/{} \;
if find $tmpdir -name '*.so' | xargs objdump -Tt | grep "*UND*" | grep "connect\|accept\|listen\|sock\|recv\|send\|host\|serv\|proto"; then
echo "Error: networking symbols found"
exit 1
fi
cd /var/tmp/dist cd /var/tmp/dist
[% c('tar', { [% c('tar', {
tar_src => [ project ], tar_src => [ project ],
......
# vim: filetype=yaml sw=2 # vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 61.0.13 version: 63.0.0
git_hash: 8faa8313bcec03775ddaa194438391c4731eb840 # v61.0.13 git_hash: 8e63363359c3d20385ed55f5308d19e321816898
git_url: https://github.com/mozilla/application-services git_url: https://github.com/mozilla/application-services
var: var:
...@@ -10,7 +10,7 @@ var: ...@@ -10,7 +10,7 @@ var:
# This should be updated when the list of gradle dependencies is changed. # This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 2 gradle_dependencies_version: 2
# This should be updated when the list of rust dependencies is changed. # This should be updated when the list of rust dependencies is changed.
rust_vendor_version: 1 rust_vendor_version: 2
# For armv7 we need a different target than the default one we use for # For armv7 we need a different target than the default one we use for
# GeckoView. We set this variable so the Rust project in the `input_files` # GeckoView. We set this variable so the Rust project in the `input_files`
# below can set the correct target when built for use in this project, # below can set the correct target when built for use in this project,
...@@ -24,19 +24,19 @@ input_files: ...@@ -24,19 +24,19 @@ input_files:
- project: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]'
name: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]'
# We need the torbrowser-* targets for Rust, see: #40094. # We need the torbrowser-* targets for Rust, see: #40094.
- project: fenix-rust - project: fenix-as-rust
name: rust-armv7 name: rust-armv7
target_prepend: target_prepend:
- torbrowser-android-armv7 - torbrowser-android-armv7
- project: fenix-rust - project: fenix-as-rust
name: rust-aarch64 name: rust-aarch64
target_prepend: target_prepend:
- torbrowser-android-aarch64 - torbrowser-android-aarch64
- project: fenix-rust - project: fenix-as-rust
name: rust-x86 name: rust-x86
target_prepend: target_prepend:
- torbrowser-android-x86 - torbrowser-android-x86
- project: fenix-rust - project: fenix-as-rust
name: rust-x86_64 name: rust-x86_64
target_prepend: target_prepend:
- torbrowser-android-x86_64 - torbrowser-android-x86_64
...@@ -85,12 +85,8 @@ input_files: ...@@ -85,12 +85,8 @@ input_files:
# `cargo vendor vendor` in the `application-services` directory has vendored # `cargo vendor vendor` in the `application-services` directory has vendored
# the sources. # the sources.
- URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2 - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
sha256sum: fd90572db453b5d83bc7dbb50b09d75c5019f09ee747054fdc12f42605d9da69 sha256sum: 70e02d587661e5d93dbe30ffa9265fb8b6b66ba8483f3268017ca919623688bc
- filename: no-git.patch - filename: no-git.patch
- filename: mavenLocal.patch - filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]' enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch - filename: target.patch
- filename: 1651660.patch
- filename: 1651662.patch
- filename: lto.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/Cargo.toml b/Cargo.toml
index 93006d8b..2c9ae848 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,4 +39,4 @@ members = [
[profile.release]
opt-level = "s"
debug = true
-lto = "thin"
+lto = "fat"
...@@ -11,14 +11,6 @@ distdir=/var/tmp/dist/binutils ...@@ -11,14 +11,6 @@ distdir=/var/tmp/dist/binutils
[% END %] [% END %]
tar xf [% project %]-[% c("version") %].tar.xz tar xf [% project %]-[% c("version") %].tar.xz
cd [% project %]-[% c("version") %] cd [% project %]-[% c("version") %]
[% IF c('var/windows') -%]
# Needed for the hardening... The upstream ticket is:
# https://sourceware.org/bugzilla/show_bug.cgi?id=17321
patch -p1 < ../enable-reloc-section-ld.patch
[% END -%]
[% IF c('var/windows-x86_64') -%]
patch -p1 < ../64bit-fixups.patch
[% END -%]
./configure --prefix=$distdir [% c('var/configure_opt') %] ./configure --prefix=$distdir [% c('var/configure_opt') %]
make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %]
make install make install
......
# vim: filetype=yaml sw=2 # vim: filetype=yaml sw=2
version: 2.31.1 version: 2.35.1
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var: var:
configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins'
...@@ -17,7 +17,3 @@ input_files: ...@@ -17,7 +17,3 @@ input_files:
file_gpg_id: 1 file_gpg_id: 1
gpg_keyring: binutils.gpg gpg_keyring: binutils.gpg
- project: container-image - project: container-image
- filename: enable-reloc-section-ld.patch
enable: '[% c("var/windows") %]'
- filename: 64bit-fixups.patch
enable: '[% c("var/windows-x86_64") %]'
...@@ -11,8 +11,10 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { ...@@ -11,8 +11,10 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) {
} elsif ($version eq 'testbuild') { } elsif ($version eq 'testbuild') {
# There is no need for an increasing build date in test builds. Just hardcode # There is no need for an increasing build date in test builds. Just hardcode
# it to a value that is compatible with the v1 versionCode scheme on Android, # it to a value that is compatible with the v1 versionCode scheme on Android,
# see: #34163. # see: #34163. We adjust the date to the new cutoff according to
$date = 20150801000000; # https://github.com/mozilla-mobile/fenix/pull/14952, following Mozilla.
# This should be unproblematic for test builds anyway.
$date = 20141228000000;
} else { } else {
my @v = split(/[\.ab]/, $version); my @v = split(/[\.ab]/, $version);
push @v, '0' if @v < 4; push @v, '0' if @v < 4;
......
...@@ -7,6 +7,17 @@ If the dependencies for `application-services`, `android-components`, or `fenix` ...@@ -7,6 +7,17 @@ If the dependencies for `application-services`, `android-components`, or `fenix`
are needed, set the `fetch_gradle_dependencies` flag in their `config` files to are needed, set the `fetch_gradle_dependencies` flag in their `config` files to
`1`. `1`.
Note: `android-components` and `fenix` require modified `geckoview` and
`android-components` artifacts to compile successfully. In order to generate the
necessary dependencies for them you need to point to the respective
`android-components` and `fenix` commits our patches are based upon, too, first.
That way the code as Mozilla is shipping it is used for the Gradle dependencies
fetching which should avoid issues caused by broken builds (it is not guaranteed
that all the dependencies are already fetched at the point when the build
breaks). For `fenix` dependencies there is still a manual processing required
afterwards right now as e.g. our tor-android-service related artifacts are not
picked up.
For the firefox project, comment out the following line in the project's build file: For the firefox project, comment out the following line in the project's build file:
export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"
......
From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 From 74ca2aebcd26adc7e3259d0802c07cc61b77a40c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com> From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 16 Nov 2019 16:22:18 +0100 Date: Sat, 16 Nov 2019 16:22:18 +0100
Subject: [PATCH] Restructure caching Subject: [PATCH] Restructure caching
...@@ -17,10 +17,10 @@ D69914, but possibly that's not the right choice. ...@@ -17,10 +17,10 @@ D69914, but possibly that's not the right choice.
Differential Revision: https://reviews.llvm.org/D70376 Differential Revision: https://reviews.llvm.org/D70376
diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp
index 110c085d3f3..aa6862cb588 100644 index 7ae7a1fd549..8c9e85e95b3 100644
--- a/llvm/lib/Analysis/LazyValueInfo.cpp --- a/llvm/lib/Analysis/LazyValueInfo.cpp
+++ b/llvm/lib/Analysis/LazyValueInfo.cpp +++ b/llvm/lib/Analysis/LazyValueInfo.cpp
@@ -133,12 +133,9 @@ namespace { @@ -136,12 +136,9 @@ namespace {
/// A callback value handle updates the cache when values are erased. /// A callback value handle updates the cache when values are erased.
class LazyValueInfoCache; class LazyValueInfoCache;
struct LVIValueHandle final : public CallbackVH { struct LVIValueHandle final : public CallbackVH {
...@@ -34,7 +34,7 @@ index 110c085d3f3..aa6862cb588 100644 ...@@ -34,7 +34,7 @@ index 110c085d3f3..aa6862cb588 100644
: CallbackVH(V), Parent(P) { } : CallbackVH(V), Parent(P) { }
void deleted() override; void deleted() override;
@@ -152,89 +149,63 @@ namespace { @@ -155,89 +152,63 @@ namespace {
/// This is the cache kept by LazyValueInfo which /// This is the cache kept by LazyValueInfo which
/// maintains information about queries across the clients' queries. /// maintains information about queries across the clients' queries.
class LazyValueInfoCache { class LazyValueInfoCache {
...@@ -86,7 +86,7 @@ index 110c085d3f3..aa6862cb588 100644 ...@@ -86,7 +86,7 @@ index 110c085d3f3..aa6862cb588 100644
- else { - else {
- auto It = ValueCache.find_as(Val); - auto It = ValueCache.find_as(Val);
- if (It == ValueCache.end()) { - if (It == ValueCache.end()) {
- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); - ValueCache[Val] = std::make_unique<ValueCacheEntryTy>(Val, this);
- It = ValueCache.find_as(Val); - It = ValueCache.find_as(Val);
- assert(It != ValueCache.end() && "Val was just added to the map!"); - assert(It != ValueCache.end() && "Val was just added to the map!");
- } - }
...@@ -135,12 +135,12 @@ index 110c085d3f3..aa6862cb588 100644 ...@@ -135,12 +135,12 @@ index 110c085d3f3..aa6862cb588 100644
- auto I = ValueCache.find_as(V); - auto I = ValueCache.find_as(V);
- if (I == ValueCache.end()) - if (I == ValueCache.end())
- return ValueLatticeElement();
- auto BBI = I->second->BlockVals.find(BB);
- if (BBI == I->second->BlockVals.end())
+ auto LatticeIt = It->second.LatticeElements.find(V); + auto LatticeIt = It->second.LatticeElements.find(V);
+ if (LatticeIt == It->second.LatticeElements.end()) + if (LatticeIt == It->second.LatticeElements.end())
return ValueLatticeElement(); return ValueLatticeElement();
- auto BBI = I->second->BlockVals.find(BB);
- if (BBI == I->second->BlockVals.end())
- return ValueLatticeElement();
- return BBI->second; - return BBI->second;
+ +
+ return LatticeIt->second; + return LatticeIt->second;
...@@ -156,7 +156,7 @@ index 110c085d3f3..aa6862cb588 100644 ...@@ -156,7 +156,7 @@ index 110c085d3f3..aa6862cb588 100644
} }