- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40097: Update toolchain for Fenix 82
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit dbdff9c7f064678194377acc0543ee1c51ccbc17 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 8 06:57:24 2020 +0000 Bug 40097: Update toolchain for Fenix 82 application-services needs a newer Rust compiler as it now uses features (strip_suffix()) that got stablizied in 1.45.0 first. We don't want to risk GeckoView stability and thus bite the bullet and add a different project solely used by application-services for the time being. We omit the clean-up as this is supposed to be temporary until Rust for GeckoView gets bumped. It is noteworthy that we still need the patch for bug 43909 albeit in a slightly updated fashion. Originally, this landed on trunk for the 10.0 release but it got backed out later on and did not reland in time for any 10.0 release. Thus, we need to keep that patch until Rust switches to LLVM 11. --- projects/fenix-as-rust/43909.patch | 252 ++++++++++++++++++++++++++++++++++++ projects/fenix-as-rust/build | 65 ++++++++++ projects/fenix-as-rust/config | 103 +++++++++++++++ projects/fenix-as-rust/unwind.patch | 162 +++++++++++++++++++++++ 4 files changed, 582 insertions(+) diff --git a/projects/fenix-as-rust/43909.patch b/projects/fenix-as-rust/43909.patch new file mode 100644 index 0000000..94e2ae2 --- /dev/null +++ b/projects/fenix-as-rust/43909.patch @@ -0,0 +1,252 @@ +From 74ca2aebcd26adc7e3259d0802c07cc61b77a40c Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 7ae7a1fd549..8c9e85e95b3 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -136,12 +136,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -155,89 +152,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = std::make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- 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); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -251,23 +222,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -277,18 +243,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -306,10 +261,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -323,10 +279,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -336,11 +292,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.28.0 + diff --git a/projects/fenix-as-rust/build b/projects/fenix-as-rust/build new file mode 100644 index 0000000..5d3d5c1 --- /dev/null +++ b/projects/fenix-as-rust/build @@ -0,0 +1,65 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu +./install.sh --prefix=$distdir-rust-old +export PATH="$distdir-rust-old/bin:$PATH" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +[% IF c("var/osx") %] + # We need to clear `CC` and `LDFLAGS` as they are used for the host platform + # (i.e. Linux). + unset CC + unset LDFLAGS + + mkdir $distdir/helper + # We need to adapt our CFLAGS and make sure our flags are passed down to all + # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort + # to a wrapper script. + cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' +#!/bin/sh +BASEDIR=/var/tmp/dist/macosx-toolchain +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" +EOF + + chmod +x $distdir/helper/x86_64-apple-darwin-clang + export PATH=$distdir/helper:$PATH +[% END %] + +cd $rootdir +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] +cd /var/tmp/build/rustc-[% c('version') %]-src + +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +cd src/llvm-project +patch -p1 < $rootdir/43909.patch +cd ../../ + +[% IF c("var/windows-i686") %] + # Cross-compiling for Windows 32bit is currently not possible without any + # patches. The reason for that is libstd expecting DWARF unwinding while most + # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. + # See: https://github.com/rust-lang/rust/issues/12859 for discussion about + # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to + # fix this problem. We apply the patch from neersighted. + patch -p1 < $rootdir/unwind.patch +[% END %] + +mkdir build +cd build +../configure --prefix=$distdir [% c("var/configure_opt") %] + +make -j[% c("buildconf/num_procs") %] +make install +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fenix-as-rust/config b/projects/fenix-as-rust/config new file mode 100644 index 0000000..4a4ae3c --- /dev/null +++ b/projects/fenix-as-rust/config @@ -0,0 +1,103 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% c("input_file_var/rust_version") %]' + +# Those values can be changed from the input_files section of other +# projects. See bug 32436. +input_file_var: + rust_version: 1.45.2 + prev_version: 1.44.1 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' + container: + use_container: 1 + +targets: + android: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("var/cross_prefix") %] --set=target.[% c("var/cross_prefix") %].cc=[% c("var/CC") %] --set=target.[% c("var/cross_prefix") %].ar=[% c("var/cross_prefix") %]-ar + + android-armv7: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar + + linux: + var: + deps: + - libc6-dev-i386 + - lib32stdc++6 + - build-essential + - python + - automake + - libssl-dev + - pkg-config + - hardening-wrapper + # We use + # `--enable-local-rust` to avoid downloading the required compiler during + # build time + # + # `--enable-vendor` to avoid downloading crates during build time and just + # use the ones which are shipped with the source + # + # `--enable-extended` to build not only rustc but cargo as well + # + # `--enable-llvm-static-stdccp` to take a libstdc++ on Jessie into account + # which is too old and if used gives undefined reference errors + # + # `--release-channel=stable` to just include stable features in the + # compiler + # + # `--sysconfdir=etc` to avoid install failures as |make install| wants to + # write to /etc otherwise + # + # the `target` triple to explicitly specify the architecture and platform + # for the compiler/std lib. Ideally, it should not be needed unless one is + # cross-compiling, but compiling `alloc_jemalloc` fails without that in a + # 32bit container. "--host=x86_64-unknown-linux-gnu" is used in its + # configure script in this case. + # `--set=` to explicitly specify the C compiler. We need to compile the + # bundled LLVM and it wants to use `cc`. However, we don't have that in + # our compiled GCC resulting in weird errors due to C and C++ compiler + # version mismatch. We avoid that with this configure option. + configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc + + osx-x86_64: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + +input_files: + - project: container-image + - project: cmake + name: cmake + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' + name: rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' + name: prev_rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - filename: unwind.patch + enable: '[% c("var/windows-i686") %]' + - filename: 43909.patch diff --git a/projects/fenix-as-rust/unwind.patch b/projects/fenix-as-rust/unwind.patch new file mode 100644 index 0000000..7b22dcb --- /dev/null +++ b/projects/fenix-as-rust/unwind.patch @@ -0,0 +1,162 @@ +From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <bjorn(a)neersighted.com> +Date: Sat, 9 Feb 2019 19:39:23 +0000 +Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux + +This is still very rough and serves as a proof-of-concept for fixing +Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and +GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long +Jump) unwinding on 32-bit Windows. + +The default for GCC (and the way it is shipped on every major distro) is +to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This +would work fine, except for the fact that libgcc (our C runtime on the +MinGW platform) exports symbols under a different name when configured +to use SJLJ-style unwinding, and uses a preprocessor macro internally to +alias them. + +Because of this, we have to detect this scenario and link to the correct +symbols ourselves. Linking has been tested with a full bootstrap on both +x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as +cross-compilation of some of my own projects. + +Obviously, the detection is a bit unrefined. Right now we +unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add +feature detection using compiler build flags or autotools-style +compilation and object analysis. Input on the best way to proceed here +is welcome. + +Also, currently there is copy-pasted/duplicated code in libunwind. +Ideally, this could be reduced, but this would likely require a +rethinking of how iOS is special-cased above, to avoid further +duplication. Input on how to best structure this file is requested. + +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index 249a183189..df08d6eb0c 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -162,7 +162,12 @@ pub fn std_cargo(builder: &Builder<'_>, + .arg("--features") + .arg("compiler-builtins-mem"); + } else { +- let features = builder.std_features(); ++ let mut features = builder.std_features(); ++ ++ // FIXME: Temporary detection of SJLJ MinGW compilers. ++ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { ++ features.push_str(" sjlj_eh"); ++ } + + if compiler.stage != 0 && builder.config.sanitizers { + // This variable is used by the sanitizer runtime crates, e.g. +diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml +index 7d60a17042..d876d0b89a 100644 +--- a/src/libstd/Cargo.toml ++++ b/src/libstd/Cargo.toml +@@ -71,3 +71,4 @@ wasm-bindgen-threads = [] + # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/… + std_detect_file_io = [] + std_detect_dlsym_getauxval = [] ++sjlj_eh = ["unwind/sjlj_eh"] +diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml +index 2378b0a315..0b5979ed62 100644 +--- a/src/libunwind/Cargo.toml ++++ b/src/libunwind/Cargo.toml +@@ -16,3 +16,6 @@ doc = false + core = { path = "../libcore" } + libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } + compiler_builtins = "0.1.0" ++ ++[features] ++sjlj_eh = [] +diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs +index 339b554ed6..ec2f93ed60 100644 +--- a/src/libunwind/libunwind.rs ++++ b/src/libunwind/libunwind.rs +@@ -1,10 +1,5 @@ + #![allow(nonstandard_style)] + +-macro_rules! cfg_if { +- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => +- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) +-} +- + use libc::{c_int, c_void, uintptr_t}; + + #[repr(C)] +@@ -73,8 +68,8 @@ pub enum _Unwind_Context {} + pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, + exception: *mut _Unwind_Exception); + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] + pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); + pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; + pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; +@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm + pc + } + } ++} // cfg_if! + +-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { +- // Not 32-bit iOS ++cfg_if! { ++if #[cfg(all(target_os = "ios", target_arch = "arm"))] { ++ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ } ++ ++ #[inline] ++ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { ++ _Unwind_SjLj_RaiseException(exc) ++ } ++ ++} else if #[cfg(feature = "sjlj_eh")] { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; + pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, + trace_argument: *mut c_void) + -> _Unwind_Reason_Code; + } +-} else { +- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() +- extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ ++ #[inline] ++ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { ++ _Unwind_SjLj_Resume(exc) + } + + #[inline] + pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { + _Unwind_SjLj_RaiseException(exc) + } ++} else { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, ++ trace_argument: *mut c_void) ++ -> _Unwind_Reason_Code; ++ } + } + } // cfg_if! +-- +2.23.0.rc0 +

1 0

[tor-browser-build/master] Bug 34360: Bump binutils to 2.35.1
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit 815db29612e3db0b901290690d1e817ad9f8f487 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 6 05:25:44 2020 +0000 Bug 34360: Bump binutils to 2.35.1 We can drop our Windows patches now as the underlying bug (https://sourceware.org/bugzilla/show_bug.cgi?id=17321) got fixed in binutils 2.34. --- projects/binutils/build | 8 -------- projects/binutils/config | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 9161192..f1cf0b9 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -11,14 +11,6 @@ distdir=/var/tmp/dist/binutils [% END %] tar xf [% project %]-[% c("version") %].tar.xz 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') %] make -j[% c("buildconf/num_procs") %] make install diff --git a/projects/binutils/config b/projects/binutils/config index 2367280..48065e1 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.31.1 +version: 2.35.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' @@ -17,7 +17,3 @@ input_files: file_gpg_id: 1 gpg_keyring: binutils.gpg - project: container-image - - filename: enable-reloc-section-ld.patch - enable: '[% c("var/windows") %]' - - filename: 64bit-fixups.patch - enable: '[% c("var/windows-x86_64") %]'

1 0

[tor-browser-build/master] Bug 40115: Update components for switch to Fenix 82
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit a8fce676b2c870f1abd092199de5857f0055b84d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 6 17:45:36 2020 +0000 Bug 40115: Update components for switch to Fenix 82 Update application-services --- projects/application-services/1651660.patch | 811 ---------------------------- projects/application-services/1651662.patch | 22 - projects/application-services/build | 2 - projects/application-services/config | 18 +- projects/nss/config | 6 +- projects/sqlcipher/config | 4 +- 6 files changed, 13 insertions(+), 850 deletions(-) diff --git a/projects/application-services/1651660.patch b/projects/application-services/1651660.patch deleted file mode 100644 index 8cf15b1..0000000 --- a/projects/application-services/1651660.patch +++ /dev/null @@ -1,811 +0,0 @@ -From 1641b74b17dad85a3ee65802a0a6320d2184c6c3 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 21 Aug 2020 19:26:37 +0000 -Subject: [PATCH] 1651660 - - -diff --git a/build.gradle b/build.gradle -index 6b16a91d..58a4ddae 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -4,16 +4,16 @@ buildscript { - ext.kotlin_version = '1.3.71' - ext.jna_version = '5.2.0' - ext.android_gradle_plugin_version = '3.6.0' -- -- // N.B. try to keep these two in sync -- ext.android_components_version = '24.0.0' -- ext.glean_version = '21.3.0' -+ ext.android_components_version = '47.0.0' - - ext.build = [ - ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile. - compileSdkVersion: 29, - targetSdkVersion: 28, - minSdkVersion: 21, // So that we can publish for aarch64. -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ jvmTargetCompatibility: "1.8", - ] - - repositories { -@@ -44,6 +44,11 @@ buildscript { - - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12' - -+ // Since the Glean version depends on the Android components version, -+ // it is very important to use a modern version of Glean and, ideally, -+ // let this come from the embedding product itself. -+ classpath "org.mozilla.components:tooling-glean-gradle:$android_components_version" -+ - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -diff --git a/components/fxa-client/android/build.gradle b/components/fxa-client/android/build.gradle -index 9981facd..e0cac485 100644 ---- a/components/fxa-client/android/build.gradle -+++ b/components/fxa-client/android/build.gradle -@@ -36,6 +36,19 @@ android { - } - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/components/logins/android/build.gradle b/components/logins/android/build.gradle -index be777e5b..166b81fe 100644 ---- a/components/logins/android/build.gradle -+++ b/components/logins/android/build.gradle -@@ -46,6 +46,19 @@ android { - includeAndroidResources = true - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -@@ -80,6 +93,12 @@ protobuf { - } - } - -+// Needs to happen before `dependencies` in order for the variables -+// exposed by the plugin to be available for this project. -+ext.gleanGenerateMarkdownDocs = true -+ext.gleanDocsDirectory = "$rootDir/docs/metrics/logins" -+apply plugin: "org.mozilla.telemetry.glean-gradle-plugin" -+ - dependencies { - // Part of the public API. - api project(':sync15') -@@ -108,7 +127,7 @@ dependencies { - testImplementation 'org.mockito:mockito-core:2.21.0' - testImplementation 'androidx.test:core-ktx:1.2.0' - testImplementation 'androidx.work:work-testing:2.2.0' -- testImplementation "org.mozilla.telemetry:glean-forUnitTests:$glean_version" -+ testImplementation "org.mozilla.telemetry:glean-forUnitTests:$project.ext.glean_version" - - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' -@@ -132,8 +151,3 @@ afterEvaluate { - - apply from: "$rootDir/publish.gradle" - ext.configurePublish() -- --ext.gleanGenerateMarkdownDocs = true --ext.gleanDocsDirectory = "$rootDir/docs/metrics/logins" --apply from: "https://github.com/mozilla-mobile/android-components/raw/v${android_compone…" -- -diff --git a/components/logins/android/metrics.yaml b/components/logins/android/metrics.yaml -index e7ddec62..c81d6e43 100644 ---- a/components/logins/android/metrics.yaml -+++ b/components/logins/android/metrics.yaml -@@ -2,31 +2,36 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --# This file defines the metrics that will be gathered for the "logins" storage component. --# These are emitted for all users of the component. Additional metrics specific to the --# *syncing* of logins are defined in a separate "sync_ping" package. -+# This file defines the metrics that will be gathered for the "logins" -+# storage component. -+# These are emitted for all users of the component. Additional metrics -+# specific to the *syncing* of logins are defined in a separate "sync_ping" -+# package. - # --# Changes to these metrics require data review, which should take into consideration --# the following known consumers of the logins component Android bindings: -+# Changes to these metrics require data review, which should take into -+# consideration the following known consumers of the logins component -+# Android bindings: - # - # * Firefox Preview - # * Firefox Lockwise for Android - -+--- - $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0 - - logins_store: - -- # These help us understand how much the logins store is being used, and whether it's succeeding -- # in the duties asked of it. We'll use them to graph e.g. the error rate of applications trying -- # to use the logins store, and identify application or platform features that lead to unusually -+ # These help us understand how much the logins store is being used, and -+ # whether it's succeeding in the duties asked of it. We'll use them to -+ # graph e.g. the error rate of applications trying to use the logins store, -+ # and identify application or platform features that lead to unusually - # high error rates. - - unlock_count: - type: counter - description: > - The number of times the login store was unlocked. -- It is intended to be used together with `unlock_error_count` to measure the overall -- error rate of unlocking the logins store. -+ It is intended to be used together with `unlock_error_count` to measure -+ the overall error rate of unlocking the logins store. - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -@@ -39,9 +44,10 @@ logins_store: - unlock_error_count: - type: labeled_counter - description: > -- The number of errors encountered when unlocking the logins store, labeled by type. -- It is intended to be used together with `unlock_count` to measure the overall error -- rate of unlocking the logins store. -+ The number of errors encountered when unlocking the logins store, labeled -+ by type. -+ It is intended to be used together with `unlock_count` to measure the -+ overall error rate of unlocking the logins store. - labels: - - invalid_key - - mismatched_lock -@@ -59,9 +65,10 @@ logins_store: - type: counter - description: > - The total number of read operations performed on the logins store. -- The count only includes operations triggered by the application, not e.g. incidental reads performed -- as part of a sync. It is intended to be used together with `read_query_error_count` to measure the -- overall error rate of read operations on the logins store. -+ The count only includes operations triggered by the application, not -+ e.g. incidental reads performed as part of a sync. It is intended to be -+ used together with `read_query_error_count` to measure the overall error -+ rate of read operations on the logins store. - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -@@ -74,9 +81,10 @@ logins_store: - read_query_error_count: - type: labeled_counter - description: > -- The total number of errors encountered during read operations on the logins store, labeled by type. -- It is intended to be used together with `read_query_count` to measure the overall error rate -- of read operations on the logins store. -+ The total number of errors encountered during read operations on the -+ logins store, labeled by type. -+ It is intended to be used together with `read_query_count` to measure -+ the overall error rate of read operations on the logins store. - labels: - - interrupted - - storage_error -@@ -93,9 +101,10 @@ logins_store: - type: counter - description: > - The total number of write operations performed on the logins store. -- The count only includes operations triggered by the application, not e.g. incidental writes performed -- as part of a sync. It is intended to be used together with `write_query_error_count` to measure the -- overall error rate of write operations on the logins store. -+ The count only includes operations triggered by the application, not -+ e.g. incidental writes performed as part of a sync. It is intended to -+ be used together with `write_query_error_count` to measure the overall -+ error rate of write operations on the logins store. - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -@@ -108,9 +117,10 @@ logins_store: - write_query_error_count: - type: labeled_counter - description: > -- The total number of errors encountered during write operations on the logins store, labeled by type. -- It is intended to be used together with `write_query_count` to measure the overall error rate -- of write operations on the logins store. -+ The total number of errors encountered during write operations on the -+ logins store, labeled by type. -+ It is intended to be used together with `write_query_count` to measure -+ the overall error rate of write operations on the logins store. - labels: - - no_such_record - - id_collision -@@ -127,14 +137,16 @@ logins_store: - expires: "2021-03-01" - - # These help us understand the performance of the logins store in the wild. -- # We'll use them to identify any application or platform features that are leading to unacceptably -- # slow performance of the store, and eventually for comparison with other logins store implementations -- # (such as the one in Desktop). -+ # We'll use them to identify any application or platform features that are -+ # leading to unacceptably slow performance of the store, and eventually for -+ # comparison with other logins store implementations (such as the one in -+ # Desktop). - - unlock_time: - type: timing_distribution - description: > -- The time taken to open the logins store on startup, or after locking it due to user inactivity. -+ The time taken to open the logins store on startup, or after locking it -+ due to user inactivity. - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -@@ -147,8 +159,8 @@ logins_store: - read_query_time: - type: timing_distribution - description: > -- The time taken to execute a read query on the logins store (such as listing all logins, or finding a -- specific login by id). -+ The time taken to execute a read query on the logins store (such as -+ listing all logins, or finding a specific login by id). - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -@@ -161,8 +173,8 @@ logins_store: - write_query_time: - type: timing_distribution - description: > -- The time taken to execute a write query on the logins store (such as adding, updating, or deleting -- a login record). -+ The time taken to execute a write query on the logins store (such as -+ adding, updating, or deleting a login record). - bugs: - - https://github.com/mozilla/application-services/issues/2225 - data_reviews: -diff --git a/components/logins/android/src/main/java/mozilla/appservices/logins/DatabaseLoginsStorage.kt b/components/logins/android/src/main/java/mozilla/appservices/logins/DatabaseLoginsStorage.kt -index ae2ba8b1..8eb2ee7a 100644 ---- a/components/logins/android/src/main/java/mozilla/appservices/logins/DatabaseLoginsStorage.kt -+++ b/components/logins/android/src/main/java/mozilla/appservices/logins/DatabaseLoginsStorage.kt -@@ -23,7 +23,6 @@ import org.mozilla.appservices.logins.GleanMetrics.LoginsStore as LoginsStoreMet - * on version updates. - */ - import mozilla.components.service.glean.private.CounterMetricType --import mozilla.components.service.glean.private.TimingDistributionMetricType - import mozilla.components.service.glean.private.LabeledMetricType - - /** -@@ -419,22 +418,6 @@ internal fun Pointer.getRustString(): String { - return this.getString(0, "utf8") - } - --/** -- * A helper extension method for conveniently measuring execution time of a closure. -- * -- * N.B. since we're measuring calls to Rust code here, the provided callback may be doing -- * unsafe things. It's very imporant that we always call the function exactly once here -- * and don't try to do anything tricky like stashing it for later or calling it multiple times. -- */ --inline fun <U> TimingDistributionMetricType.measure(funcToMeasure: () -> U): U { -- val timerId = this.start() -- try { -- return funcToMeasure() -- } finally { -- this.stopAndAccumulate(timerId) -- } --} -- - /** - * A helper class for gathering basic count metrics on different kinds of LoginsStore operation. - * -diff --git a/components/places/android/build.gradle b/components/places/android/build.gradle -index 4debb737..5655326c 100644 ---- a/components/places/android/build.gradle -+++ b/components/places/android/build.gradle -@@ -44,6 +44,19 @@ android { - includeAndroidResources = true - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -@@ -77,6 +90,11 @@ protobuf { - } - } - -+// Generate markdown docs for the collected metrics. -+ext.gleanGenerateMarkdownDocs = true -+ext.gleanDocsDirectory = "$rootDir/docs/metrics/places" -+apply plugin: "org.mozilla.telemetry.glean-gradle-plugin" -+ - dependencies { - // Part of the public API. - api project(':sync15') -@@ -105,7 +123,7 @@ dependencies { - testImplementation 'org.mockito:mockito-core:2.21.0' - testImplementation 'androidx.test:core-ktx:1.2.0' - testImplementation 'androidx.work:work-testing:2.2.0' -- testImplementation "org.mozilla.telemetry:glean-forUnitTests:$glean_version" -+ testImplementation "org.mozilla.telemetry:glean-forUnitTests:$project.ext.glean_version" - - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' -@@ -130,8 +148,3 @@ afterEvaluate { - apply from: "$rootDir/publish.gradle" - - ext.configurePublish() -- --// Generate markdown docs for the collected metrics. --ext.gleanGenerateMarkdownDocs = true --ext.gleanDocsDirectory = "$rootDir/docs/metrics/places" --apply from: "https://github.com/mozilla-mobile/android-components/raw/v${android_compone…" -diff --git a/components/places/android/metrics.yaml b/components/places/android/metrics.yaml -index 2c4b7891..dcfd1318 100644 ---- a/components/places/android/metrics.yaml -+++ b/components/places/android/metrics.yaml -@@ -2,15 +2,19 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --# This file defines the metrics that will be gathered for the "places" storage component. --# These are emitted for all users of the component. Additional metrics specific to the --# *syncing* of places are defined in a separate "sync_ping" package. -+# This file defines the metrics that will be gathered for the "places" -+# storage component. -+# These are emitted for all users of the component. Additional metrics -+# specific to the *syncing* of places are defined in a separate "sync_ping" -+# package. - # --# Changes to these metrics require data review, which should take into consideration -+# Changes to these metrics require data review, which should take into -+# consideration - # the following known consumers of the places component Android bindings: - # - # * Fenix for Andriod - -+--- - $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0 - - places_manager: -@@ -19,9 +23,10 @@ places_manager: - type: counter - description: > - The total number of read operations performed on the places store. -- The count only includes operations triggered by the application, not e.g. incidental reads performed -- as part of a sync. It is intended to be used together with `read_query_error_count` to measure the -- overall error rate of read operations on the places store. -+ The count only includes operations triggered by the application, not -+ e.g. incidental reads performed as part of a sync. It is intended to -+ be used together with `read_query_error_count` to measure the overall -+ error rate of read operations on the places store. - bugs: - - https://github.com/mozilla/application-services/issues/2300 - - https://github.com/mozilla/application-services/issues/2299 -@@ -35,9 +40,10 @@ places_manager: - read_query_error_count: - type: labeled_counter - description: > -- The total number of errors encountered during read operations on the places store, labeled by type. -- It is intended to be used together with `read_query_count` to measure the overall error rate -- of read operations on the places store. -+ The total number of errors encountered during read operations on the -+ places store, labeled by type. -+ It is intended to be used together with `read_query_count` to measure -+ the overall error rate of read operations on the places store. - labels: - - url_parse_failed - - operation_interrupted -@@ -55,9 +61,10 @@ places_manager: - type: counter - description: > - The total number of write operations performed on the places store. -- The count only includes operations triggered by the application, not e.g. incidental writes performed -- as part of a sync. It is intended to be used together with `write_query_error_count` to measure the -- overall error rate of write operations on the places store. -+ The count only includes operations triggered by the application, not -+ e.g. incidental writes performed as part of a sync. It is intended to -+ be used together with `write_query_error_count` to measure the overall -+ error rate of write operations on the places store. - bugs: - - https://github.com/mozilla/application-services/issues/2300 - - https://github.com/mozilla/application-services/issues/2299 -@@ -71,9 +78,10 @@ places_manager: - write_query_error_count: - type: labeled_counter - description: > -- The total number of errors encountered during write operations on the places store, labeled by type. -- It is intended to be used together with `write_query_count` to measure the overall error rate -- of write operations on the places store. -+ The total number of errors encountered during write operations on the -+ places store, labeled by type. -+ It is intended to be used together with `write_query_count` to measure -+ the overall error rate of write operations on the places store. - labels: - - url_parse_failed - - invalid_bookmark_update -@@ -108,8 +116,9 @@ places_manager: - scan_query_time: - type: timing_distribution - description: > -- The time taken to execute a scan query on the places store. This metric is for queries that we -- expect to be costly e.g. getBookmarksTree(guid, recursive=True). -+ The time taken to execute a scan query on the places store. This metric -+ is for queries that we expect to be costly -+ e.g. getBookmarksTree(guid, recursive=True). - bugs: - - https://github.com/mozilla/application-services/issues/2300 - - https://github.com/mozilla/application-services/issues/2299 -diff --git a/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt b/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt -index 518bf77a..df2110c4 100644 ---- a/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt -+++ b/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt -@@ -27,7 +27,6 @@ import org.mozilla.appservices.places.GleanMetrics.PlacesManager as PlacesManage - * on version updates. - */ - import mozilla.components.service.glean.private.CounterMetricType --import mozilla.components.service.glean.private.TimingDistributionMetricType - import mozilla.components.service.glean.private.LabeledMetricType - - /** -@@ -1273,22 +1272,6 @@ data class VisitInfosWithBound( - } - } - --/** -- * A helper extension method for conveniently measuring execution time of a closure. -- * -- * N.B. since we're measuring calls to Rust code here, the provided callback may be doing -- * unsafe things. It's very imporant that we always call the function exactly once here -- * and don't try to do anything tricky like stashing it for later or calling it multiple times. -- */ --inline fun <U> TimingDistributionMetricType.measure(funcToMeasure: () -> U): U { -- val timerId = this.start() -- try { -- return funcToMeasure() -- } finally { -- this.stopAndAccumulate(timerId) -- } --} -- - /** - * A helper class for gathering basic count metrics on different kinds of PlacesManager operations. - * -diff --git a/components/push/android/build.gradle b/components/push/android/build.gradle -index c68815f1..9dcc0678 100644 ---- a/components/push/android/build.gradle -+++ b/components/push/android/build.gradle -@@ -36,6 +36,19 @@ android { - } - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/components/rc_log/android/build.gradle b/components/rc_log/android/build.gradle -index 07f6b238..ad813fca 100644 ---- a/components/rc_log/android/build.gradle -+++ b/components/rc_log/android/build.gradle -@@ -29,6 +29,19 @@ android { - // has their own build dir) - test.resources.srcDirs += "${project(':full-megazord').buildDir}/rustJniLibs/desktop" - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/components/support/android/build.gradle b/components/support/android/build.gradle -index 6555c057..0454acb2 100644 ---- a/components/support/android/build.gradle -+++ b/components/support/android/build.gradle -@@ -25,6 +25,18 @@ android { - } - } - -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - dependencies { -diff --git a/components/sync15/android/build.gradle b/components/sync15/android/build.gradle -index cd9f7c63..48520a94 100644 ---- a/components/sync15/android/build.gradle -+++ b/components/sync15/android/build.gradle -@@ -25,6 +25,18 @@ android { - } - } - -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - dependencies { -diff --git a/components/sync_manager/android/build.gradle b/components/sync_manager/android/build.gradle -index 7593e09c..2f1bc7fb 100644 ---- a/components/sync_manager/android/build.gradle -+++ b/components/sync_manager/android/build.gradle -@@ -33,6 +33,19 @@ android { - } - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/components/tabs/android/build.gradle b/components/tabs/android/build.gradle -index 7593e09c..2f1bc7fb 100644 ---- a/components/tabs/android/build.gradle -+++ b/components/tabs/android/build.gradle -@@ -33,6 +33,19 @@ android { - } - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/components/viaduct/android/build.gradle b/components/viaduct/android/build.gradle -index 842da737..bbffa362 100644 ---- a/components/viaduct/android/build.gradle -+++ b/components/viaduct/android/build.gradle -@@ -37,6 +37,19 @@ android { - } - } - } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/docs/metrics/logins/metrics.md b/docs/metrics/logins/metrics.md -index 1a8cce22..bd16ea75 100644 ---- a/docs/metrics/logins/metrics.md -+++ b/docs/metrics/logins/metrics.md -@@ -4,7 +4,6 @@ - This document enumerates the metrics collected by this project. - This project may depend on other projects which also collect metrics. - This means you might have to go searching through the dependency tree to get a full picture of everything collected by this project. --Sorry about that. - - # Pings - -@@ -12,21 +11,24 @@ Sorry about that. - - - ## metrics -+ - This is a built-in ping that is assembled out of the box by the Glean SDK. -+ - See the Glean SDK documentation for the [`metrics` ping](https://mozilla.github.io/glean/book/user/pings/metrics.html). -+ - The following metrics are added to the ping: - - | Name | Type | Description | Data reviews | Extras | Expiration | - | --- | --- | --- | --- | --- | --- | --| logins_store.read_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of read operations performed on the logins store. The count only includes operations triggered by the application, not e.g. incidental reads performed as part of a sync. It is intended to be used together with `read_query_error_count` to measure the overall error rate of read operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | --| logins_store.read_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during read operations on the logins store, labeled by type. It is intended to be used together with `read_query_count` to measure the overall error rate of read operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)|<ul><li>interrupted</li><li>storage_error</li></ul>|2020-07-01 | --| logins_store.read_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a read query on the logins store (such as listing all logins, or finding a specific login by id). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | --| logins_store.unlock_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of times the login store was unlocked. It is intended to be used together with `unlock_error_count` to measure the overall error rate of unlocking the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | --| logins_store.unlock_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The number of errors encountered when unlocking the logins store, labeled by type. It is intended to be used together with `unlock_count` to measure the overall error rate of unlocking the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)|<ul><li>invalid_key</li><li>mismatched_lock</li><li>storage_error</li></ul>|2020-07-01 | --| logins_store.unlock_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to open the logins store on startup, or after locking it due to user inactivity. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | --| logins_store.write_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of write operations performed on the logins store. The count only includes operations triggered by the application, not e.g. incidental writes performed as part of a sync. It is intended to be used together with `write_query_error_count` to measure the overall error rate of write operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | --| logins_store.write_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during write operations on the logins store, labeled by type. It is intended to be used together with `write_query_count` to measure the overall error rate of write operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)|<ul><li>no_such_record</li><li>id_collision</li><li>interrupted</li><li>invalid_record</li><li>storage_error</li></ul>|2020-07-01 | --| logins_store.write_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a write query on the logins store (such as adding, updating, or deleting a login record). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895)||2020-07-01 | -+| logins_store.read_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of read operations performed on the logins store. The count only includes operations triggered by the application, not e.g. incidental reads performed as part of a sync. It is intended to be used together with `read_query_error_count` to measure the overall error rate of read operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| logins_store.read_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during read operations on the logins store, labeled by type. It is intended to be used together with `read_query_count` to measure the overall error rate of read operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)|<ul><li>interrupted</li><li>storage_error</li></ul>|2021-03-01 | -+| logins_store.read_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a read query on the logins store (such as listing all logins, or finding a specific login by id). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| logins_store.unlock_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of times the login store was unlocked. It is intended to be used together with `unlock_error_count` to measure the overall error rate of unlocking the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| logins_store.unlock_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The number of errors encountered when unlocking the logins store, labeled by type. It is intended to be used together with `unlock_count` to measure the overall error rate of unlocking the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)|<ul><li>invalid_key</li><li>mismatched_lock</li><li>storage_error</li></ul>|2021-03-01 | -+| logins_store.unlock_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to open the logins store on startup, or after locking it due to user inactivity. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| logins_store.write_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of write operations performed on the logins store. The count only includes operations triggered by the application, not e.g. incidental writes performed as part of a sync. It is intended to be used together with `write_query_error_count` to measure the overall error rate of write operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| logins_store.write_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during write operations on the logins store, labeled by type. It is intended to be used together with `write_query_count` to measure the overall error rate of write operations on the logins store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)|<ul><li>no_such_record</li><li>id_collision</li><li>interrupted</li><li>invalid_record</li><li>storage_error</li></ul>|2021-03-01 | -+| logins_store.write_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a write query on the logins store (such as adding, updating, or deleting a login record). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1597895), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | - - -  -diff --git a/docs/metrics/places/metrics.md b/docs/metrics/places/metrics.md -index efdc5723..8f7cb68c 100644 ---- a/docs/metrics/places/metrics.md -+++ b/docs/metrics/places/metrics.md -@@ -4,7 +4,6 @@ - This document enumerates the metrics collected by this project. - This project may depend on other projects which also collect metrics. - This means you might have to go searching through the dependency tree to get a full picture of everything collected by this project. --Sorry about that. - - # Pings - -@@ -12,19 +11,22 @@ Sorry about that. - - - ## metrics -+ - This is a built-in ping that is assembled out of the box by the Glean SDK. -+ - See the Glean SDK documentation for the [`metrics` ping](https://mozilla.github.io/glean/book/user/pings/metrics.html). -+ - The following metrics are added to the ping: - - | Name | Type | Description | Data reviews | Extras | Expiration | - | --- | --- | --- | --- | --- | --- | --| places_manager.read_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of read operations performed on the places store. The count only includes operations triggered by the application, not e.g. incidental reads performed as part of a sync. It is intended to be used together with `read_query_error_count` to measure the overall error rate of read operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)||2020-07-01 | --| places_manager.read_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during read operations on the places store, labeled by type. It is intended to be used together with `read_query_count` to measure the overall error rate of read operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)|<ul><li>url_parse_failed</li><li>operation_interrupted</li></ul>|2020-07-01 | --| places_manager.read_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a read query on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)||2020-07-01 | --| places_manager.scan_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a scan query on the places store. This metric is for queries that we expect to be costly e.g. getBookmarksTree(guid, recursive=True). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)||2020-07-01 | --| places_manager.write_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of write operations performed on the places store. The count only includes operations triggered by the application, not e.g. incidental writes performed as part of a sync. It is intended to be used together with `write_query_error_count` to measure the overall error rate of write operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)||2020-07-01 | --| places_manager.write_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during write operations on the places store, labeled by type. It is intended to be used together with `write_query_count` to measure the overall error rate of write operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)|<ul><li>url_parse_failed</li><li>invalid_bookmark_update</li><li>invalid_parent</li><li>unknown_bookmark_item</li><li>url_too_long</li><li>cannot_update_root</li></ul>|2020-07-01 | --| places_manager.write_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a write query on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621)||2020-07-01 | -+| places_manager.read_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of read operations performed on the places store. The count only includes operations triggered by the application, not e.g. incidental reads performed as part of a sync. It is intended to be used together with `read_query_error_count` to measure the overall error rate of read operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| places_manager.read_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during read operations on the places store, labeled by type. It is intended to be used together with `read_query_count` to measure the overall error rate of read operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)|<ul><li>url_parse_failed</li><li>operation_interrupted</li></ul>|2021-03-01 | -+| places_manager.read_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a read query on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| places_manager.scan_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a scan query on the places store. This metric is for queries that we expect to be costly e.g. getBookmarksTree(guid, recursive=True). |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| places_manager.write_query_count |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of write operations performed on the places store. The count only includes operations triggered by the application, not e.g. incidental writes performed as part of a sync. It is intended to be used together with `write_query_error_count` to measure the overall error rate of write operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | -+| places_manager.write_query_error_count |[labeled_counter](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html) |The total number of errors encountered during write operations on the places store, labeled by type. It is intended to be used together with `write_query_count` to measure the overall error rate of write operations on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)|<ul><li>url_parse_failed</li><li>invalid_bookmark_update</li><li>invalid_parent</li><li>unknown_bookmark_item</li><li>url_too_long</li><li>cannot_update_root</li></ul>|2021-03-01 | -+| places_manager.write_query_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to execute a write query on the places store. |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1607621), [2](https://bugzilla.mozilla.org/show_bug.cgi?id=1649044)||2021-03-01 | - - -  -diff --git a/megazords/full/android/build.gradle b/megazords/full/android/build.gradle -index 91d4071e..6da43879 100644 ---- a/megazords/full/android/build.gradle -+++ b/megazords/full/android/build.gradle -@@ -29,6 +29,19 @@ android { - - // Uncomment to include debug symbols in native library builds. - // packagingOptions { doNotStrip "**/*.so" } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { -diff --git a/megazords/lockbox/android/build.gradle b/megazords/lockbox/android/build.gradle -index 5f4d5234..be7654ee 100644 ---- a/megazords/lockbox/android/build.gradle -+++ b/megazords/lockbox/android/build.gradle -@@ -29,6 +29,19 @@ android { - - // Uncomment to include debug symbols in native library builds. - // packagingOptions { doNotStrip "**/*.so" } -+ -+ // This is required to support new AndroidX support libraries. -+ // See mozilla-mobile/android-components#842 -+ compileOptions { -+ sourceCompatibility rootProject.ext.build.jvmTargetCompatibility -+ targetCompatibility rootProject.ext.build.jvmTargetCompatibility -+ } -+ -+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { -+ kotlinOptions { -+ jvmTarget = rootProject.ext.build.jvmTargetCompatibility -+ } -+ } - } - - configurations { --- -2.28.0 - diff --git a/projects/application-services/1651662.patch b/projects/application-services/1651662.patch deleted file mode 100644 index 0275da2..0000000 --- a/projects/application-services/1651662.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1818764e69145839ab33a2f885139ea320f2283f Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)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 - diff --git a/projects/application-services/build b/projects/application-services/build index 5c6b5e0..7c5da2d 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -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 # complexity. That's needed for running unit tests later on, though. patch -p1 < $rootdir/target.patch -patch -p1 < $rootdir/1651660.patch -patch -p1 < $rootdir/1651662.patch [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via # Gradle's --debug. See: tor-browser-build#40056. diff --git a/projects/application-services/config b/projects/application-services/config index 336de62..e4ea05d 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 61.0.13 -git_hash: 8faa8313bcec03775ddaa194438391c4731eb840 # v61.0.13 +version: 63.0.0 +git_hash: 8e63363359c3d20385ed55f5308d19e321816898 git_url: https://github.com/mozilla/application-services var: @@ -10,7 +10,7 @@ var: # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 2 # 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 # 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, @@ -24,19 +24,19 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' # We need the torbrowser-* targets for Rust, see: #40094. - - project: fenix-rust + - project: fenix-as-rust name: rust-armv7 target_prepend: - torbrowser-android-armv7 - - project: fenix-rust + - project: fenix-as-rust name: rust-aarch64 target_prepend: - torbrowser-android-aarch64 - - project: fenix-rust + - project: fenix-as-rust name: rust-x86 target_prepend: - torbrowser-android-x86 - - project: fenix-rust + - project: fenix-as-rust name: rust-x86_64 target_prepend: - torbrowser-android-x86_64 @@ -85,10 +85,8 @@ input_files: # `cargo vendor vendor` in the `application-services` directory has vendored # the sources. - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vend… c('var/rust_vendor_version') %].tar.bz2 - sha256sum: fd90572db453b5d83bc7dbb50b09d75c5019f09ee747054fdc12f42605d9da69 + sha256sum: 70e02d587661e5d93dbe30ffa9265fb8b6b66ba8483f3268017ca919623688bc - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: target.patch - - filename: 1651660.patch - - filename: 1651662.patch diff --git a/projects/nss/config b/projects/nss/config index 2b5b4d3..fb3550c 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 3.53.1 -nspr_version: 4.25 +version: 3.56 +nspr_version: 4.28 var: container: use_container: 1 @@ -19,7 +19,7 @@ input_files: project: ninja - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' name: nss - sha256sum: 132ce527f3963e3ae5be3337ed4e1099e160b9402be177b5704de3ed2f5271d2 + sha256sum: 989b548aa5589d15e31a306218d3c48dbc472b6043b78c6846b5acc54ebfed67 - filename: configure.patch - filename: config.patch - filename: bug_13028.patch diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config index da78dcd..fb4ae3a 100644 --- a/projects/sqlcipher/config +++ b/projects/sqlcipher/config @@ -2,7 +2,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' # The required versions for application-services can be found at the respective # commit in libs/build-all.sh -version: 4.3.0 +version: 4.4.0 var: container: use_container: 1 @@ -18,4 +18,4 @@ input_files: project: nss - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") %].tar.gz' name: sqlcipher - sha256sum: fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f + sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40115_v6'
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit 8efcab700904099020293b1dcaf51bbc681446a0 Merge: a86e9f9 4338d3d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 12 02:58:37 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40115_v6' projects/android-components/40085.patch | 10 +- projects/android-components/build | 20 +- projects/android-components/config | 6 +- projects/android-components/git.patch | 23 +- .../gradle-dependencies-list.txt | 82 +-- projects/application-services/1651660.patch | 811 --------------------- projects/application-services/1651662.patch | 22 - projects/application-services/build | 15 - projects/application-services/config | 20 +- projects/application-services/lto.patch | 10 - projects/binutils/build | 8 - projects/binutils/config | 6 +- projects/common/get-moz-build-date | 6 +- .../how-to-create-gradle-dependencies-list.txt | 11 + .../{fenix-clang => fenix-as-rust}/43909.patch | 28 +- projects/fenix-as-rust/build | 65 ++ projects/fenix-as-rust/config | 103 +++ projects/fenix-as-rust/unwind.patch | 162 ++++ projects/fenix-clang/build | 19 +- projects/fenix-clang/config | 7 +- projects/fenix/config | 6 +- projects/fenix/gradle-dependencies-list.txt | 390 +++++----- projects/geckoview/config | 4 +- projects/geckoview/gradle-dependencies-list.txt | 274 +++---- projects/geckoview/mozconfig-android-all | 2 + projects/llvm-project/build | 8 + projects/llvm-project/config | 5 + projects/nss/build | 4 - projects/nss/config | 6 +- projects/sqlcipher/config | 4 +- 30 files changed, 822 insertions(+), 1315 deletions(-)

1 0

[tor-browser-build/master] Bug 40115: Update components for switch to Fenix 82
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit cb95a1c0b06e2b2e3d596bef70eabb521f5e3f25 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 8 19:09:10 2020 +0000 Bug 40115: Update components for switch to Fenix 82 Update documentation on how to fetch Gradle dependencies --- projects/common/how-to-create-gradle-dependencies-list.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index 3435c31..940f810 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -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 `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: export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"

1 0

[tor-browser-build/master] Bug 40115: Update components for switch to Fenix 82
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit 02d15b8a84bbd884e92f8131cbe3db8e9a288ca9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 8 08:28:09 2020 +0000 Bug 40115: Update components for switch to Fenix 82 Update android-components We additionally clean up our build script so that we actually only compile the browser engine code we want to be compiled (the build breaks otherwise due to GeckoView mismatch which caused us to exempt geckoview-nightly from getting overwritten by our own earlier on). --- projects/android-components/40085.patch | 10 +-- projects/android-components/build | 20 ++++-- projects/android-components/config | 6 +- projects/android-components/git.patch | 23 ++++-- .../gradle-dependencies-list.txt | 82 +++++++++++----------- 5 files changed, 81 insertions(+), 60 deletions(-) diff --git a/projects/android-components/40085.patch b/projects/android-components/40085.patch index eb1a29d..5d15305 100644 --- a/projects/android-components/40085.patch +++ b/projects/android-components/40085.patch @@ -1,18 +1,18 @@ -From efa26eaf4fba939c3e43b659e5c77a57b22b270a Mon Sep 17 00:00:00 2001 +From 581a25d6dd543e56cb0d3291031818acac28999b Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)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 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 +++ b/buildSrc/src/main/java/Dependencies.kt @@ -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 material = "1.1.0" diff --git a/projects/android-components/build b/projects/android-components/build index 035ae48..491bf24 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -14,11 +14,10 @@ EOF [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] 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 - # getting used when building beta/release code. XXX: Find a way to make that - # work for nightly, too. - find $gradle_repo -type f $ -name geckoview-[^a-z]*.aar -o -name geckoview-beta*.aar $ -exec cp -f $distdir/geckoview/geckoview*.aar {} \; + # getting used when building beta/release code. + find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} \; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -38,7 +37,7 @@ patch -p1 < $rootdir/40085.patch # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # results in some missing dependencies for yet unknown reasons. Thus, we use # `assemble` instead for now. - gradle --debug -no-daemon assemble + gradle --debug --no-daemon assemble [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 @@ -55,8 +54,19 @@ patch -p1 < $rootdir/40085.patch exit 1 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" + # XXX: Take release into account gradle $gradle_args assembleGeckoBeta -x lint gradle $gradle_args publish diff --git a/projects/android-components/config b/projects/android-components/config index e42c0c9..e0e10b4 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -7,12 +7,12 @@ tag_gpg_id: 1 gpg_keyring: torbutton.gpg var: - android_components_version: 57.0.7 + android_components_version: 60.0.3 torbrowser_branch: 10.0 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. @@ -20,7 +20,7 @@ var: targets: 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 input_files: diff --git a/projects/android-components/git.patch b/projects/android-components/git.patch index 06638f5..0f510f7 100644 --- a/projects/android-components/git.patch +++ b/projects/android-components/git.patch @@ -1,14 +1,14 @@ -From a77b847b6451c598176137b944edf27e6e7202a2 Mon Sep 17 00:00:00 2001 +From 96fc057633a96188e00a55a0abc28a19d9b1dcf9 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> 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 -index aa4c1b005..4318f1334 100644 +index 094c85e44..1b46c1b84 100644 --- a/components/support/base/build.gradle +++ b/components/support/base/build.gradle -@@ -37,7 +37,7 @@ android { +@@ -38,7 +38,7 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -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 diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index a82d51e..7d24b28 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -392,48 +392,46 @@ e3856758c3bb08b7c97ddcd493521c5e0bd0741717c93b292bf1a541513af082 | https://jcent 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 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-forU… -369a6635f8cb0f6e8e1c9149900903f7deb47c226b67befaae6aedd84c87f724 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -710686da2a7d4a45c8e1a916d7f994730af8ef5851714fd926772976ac1cfc1c | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/61.0… -58f3553ea92ced0a746b25edbd7ace112a1b95da9f3532c97ad180861011dcc5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/61.0… -05bc9d4f437f9f66e82312c25b66c8b98ff5e9763e66852ed9006f409395b0fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/61.0.13/… -245d0d1d208955ccaf8eb024fc656d3a4e58714728f3b808698f839f954f8777 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/61.0.13/… -6aaead9440159e47921df63daff7e126a1679d6dd8ffddd8ac27c3038a175089 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/61.0.13… -1c3a2f89320adbca73db7654782b05e3dc9a1819dbbed5acea3529bfec8d6834 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/61.0.13… -9572bdf0cf07a390cb7fe125a4062827ef18ebfdb9cecc2a229ac7bab1045c24 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/61.0.13/log… -5625532e701bf641fbec212eb8b389844c5687b656c5ad8309a797e9222e07b7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/61.0.13/log… -0ac0b96af98726e54c97b7aa2b52d2205c05e6edd0c8c88279e21798f8c49c41 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/61.… -bbc378284b26da3f33309a94c68a8ef8856cc8cce39b41ba203955f747c36729 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/61.… -39e1e04e6cae9f1d3d77f028eb5a63340368b58c5c4266b3e9134b25052f3f4f | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/61.0.13/pla… -3ec1d8818b70dfd0661a6ce8931bd950dc728dc7ef9c407cc76a353198159552 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/61.0.13/pla… -cfa58458b1d04eaad4adfc558edc74ffc6d6308edc72243683cd6de2052ea0e0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/61.0.13/push-… -6d08d646a02949933f1ed892386701dc51a38c6ae3ad683c13f461d3e970d39f | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/61.0.13/push-… -94a93c5b9d321ce72acd07951d0d3f9f645847fceca357f26168d625a8c32365 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/61.0.13/ru… -5199a72884153b65b8b1c0cc9f6f3925ee09184be2fac3a5888935b8d64d6a7e | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/61.0.13/ru… -a318804a6d52b0431dbb23f0643101e56f73d0c04d906f3e75e9373257899b01 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/61.0.13/syn… -b8740d75ff31c0402f8b75edd26046ddb1c6dcb28e880366b00227d8ec7e1d4b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/61.0.13/syn… -7f43407000d5faa6c409ee2cd69b21c66e1961b1fd151607f6808a6ba07b1405 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/61.0.1… -54d1a69f5a00b84bd4bf61ef024e73371b13c2b57c31ebcd6cf7581b18267e3b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/61.0.1… -b509686c9eb57b4a89b6ad5482ce99221a41ec8de410427d6a90bc6fc1a8315a | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-… -0cfa4b1f7e0da13288a81551aafabb7429990957451937c7c1a747f8c7cf22a4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-… -bea33339616250107cddcb692f182a1ebce4a33b0c9b103351433688587f31d1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/24.0.… -0f856b0f4cc29a551ffd0e65e7e53ab022a4adc1e8067c67fdcb65cc8cef2fbe | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/24.0.… -e79c14fd4463a263a481191fcb4332db47cc8abc64e47ca5637c9bd91f7d87e9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… -f030aabb57b0b6da86e0cdb0be073c190016d3abe6dacb2f070d42c00f269ce0 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… -14205f412218ba5c8c05a1c5713fff564b22436b88d5182ebab959afd1c93f75 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/24.0.… -f3ce16a38f1b0ef7fbabd2bf25cff54e64a03dcfceb7de96fce7c780e2f58a69 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/24.0.… -14e92790f570624d65a7e43b00d08d6cefd822d3586b4ec836691b1187504640 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/24.0.0… -14fdad3d3b00cc5a43c106b723d2448064d111d4c9ba473fbe60515977c9424d | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/24.0.0… -d69cc02f0b0a8d53bf425e97b8ac3b9ec932b549717750172316325284f8d094 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/24.0.0/… -7bd257231ba2e0d5aa03e92a4c26f88a09c05e21043abf18dc0f47720e35c415 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/24.0.0/… -a05be676278b6e176ae8d3801bd4d0ebcf77bc81411f25f1d059b713d5ca9da7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/24.0.… -8ca4bae0f6d2b165d6d92ac4af4321bcec0bcd4cd72b0bf9921d8abd966a42f1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/24.0.… -dbc48baf933d7e57eaf7f50c1fabb4c45ecabd0a8bd7a21f5533ab05d1b821d8 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.… -3fe97c6a7bf5bb85cd85f1b2b732bece663fce5a87e4406f95334b9c866f3e20 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.… -e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… -41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… -f654485c119c284c7e8132154753e11089254ef27b47abe880e4830abe0bf804 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… -9aee6e0f93d25b480c8bce9720f6e9ef73d0e866b1eddf68492805f021076bb3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +3520e710bea6a79317db7ffcba1ab03e54696dc154550d7101220adb329232b5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +bbfc48708d67383ffeb65ff20416b0477e378edb8319c6e8802c887f12a27333 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +032545e2abad022bac2192d9c11bba9439f954b5c939a1b15d8fb9d78aeb3bc5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0… +ede284cc085fde78fb2650cb48a0bb537272cf76425eeeaf76b44309aa8ac1b4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0… +d32cf0439223b97424243d4516b044301494f698e17d80c44241e19c97423f5f | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/f… +9d35aecc1770669c5a253749212a254fca379f40f87eda8e38b53a210ec4bdca | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/f… +e879e577aba4210949e4b10eb4013f451c270c6d174c61ff518933812ed1cefa | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/… +642ab85c85ef07bbac292638935f5db527ca457ac98862fe60821a4f246cab8a | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/… +6dc4870a15a866112e0fd960f9a14be6c65ea1ae7b85f18e0fd08f8001a13881 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logi… +06e78f40e5c2db1e6bcb275b5d2b2c26f83b1f096e88273c2c11819f9f4db1e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logi… +e31ec1cc55287f27e6eac65e31aff5306df5667ba35e7e0b90e5530c9d5e2ddc | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.… +68c16f560c397b55e46b6a46791391452f4c4212b720627c440f36c8d25f11a3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.… +9ae67ef84b6b9c1f446f98b4d08e18a82fa8d1222e708ef3043cdc841cc08aaa | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/plac… +c864a036385df7254d11e8c92fc78cf7e4f18ba64fc175aa7a641eb7eb997b0b | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/plac… +8f1a4aa9adef85c557f831c65ffb6fe7d3a3b20d09303f753799628f8d138644 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-6… +b87499e129d7bcfd13ad228ef131b16bd4d83f4566a208555a3004194c9cef9b | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-6… +77a6a0f3ec7b2d9f0dec6476ef8dd930bbd403829bc4f73eca6100b9834f5d7f | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rus… +5341bf383990d4cbeb19b6cb972f65f30050ac9c73558ab94018a98fff4811b3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rus… +d583c72e82c4dc62c0ee4140e2c7e253e609c890f1c8c7dda5fb7ae726c04479 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync… +1ff2d3d757cd63f6b240b7ed5604810f70e97bdb5f314f8600a3f443be97cf8e | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync… +83bff9bafc078bb36ac3cf0db9d1ec1fcebc5aefb4ab2f76e5bcdf35752cf5d6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0… +7cc2954d065c14e1a7cb49f8a4fb9b330f76c4ebc625d50f8a00d53e5f74bbbe | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0… +53f24189f0cff54e7b4937b6fd1e990b1ff8d9a52e8cc2b254852dabe08d1903 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-6… +a35dd95abca6750f590232a723f177c499b98c9640735ab1ab660327a4d0e3b1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-6… +e14c614b65ae4fe6c6d26ce369d523cf1ff837ce697e5e3f47e8cdfa355357f9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.… +e7bd7b2e2013a080bcb3cb9db974185eb28dd87c0594394f951a51ab5d6fcf5d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.… +e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.… +32acc51221752051a03765ac0bbf26a1da663ba2f7b3fe69ae422d5aac228f81 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.… +ae35db5670efe458d3b9646cab337f2f7667becacdb023b599cc62bfa95b59ec | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0… +d87cd2eea092430c4e5a95ff04c3213be89f54aa61c2c7f80fb6548e6dc38bab | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0… +96aeede35017fd79576c5faa1cb41efc8137616e20231b41934999ca711f4407 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/… +dbd706151fe820ed233792a6773b70efcceb42987c209e27575ef91d4552b8c4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/… +22934a560b0bc34f01304efbdccc988d2e0fca039ae577894fcec52a7fdfd88e | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.… +a2c1e39e5e58f585c2908af2266953b6b43e51f2fabe45e7723bc177c9c49bc0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.… +f399bb05c62897849291f58296554844fdcb6dafe7ba355a6bfa61ad9deadeac | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/82.0.… +cd3e8717a958c523bf06b974e2241a0ef5fac26043bb571ea7ad2d2db630d8c2 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/82.0.… +593eec7ce486e9ab552f686a4fb4ba9fb96ff8a5ec0f58176fa839e5cca27758 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/83… +2c2688dc22a1961a99ac7f14185354ba2e9239bb284f19285fc70ddd89b63cd3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/83… +b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/…

1 0

[tor-browser-build/master] Bug 40115: Update components for switch to Fenix 82
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

1 0

[tor-browser-build/master] Fold in 10.0a8 Changelog
by sysrqb＠torproject.org 12 Oct '20

12 Oct '20

commit a86e9f9c6335d0f064c394e74f0395b32c1b6c7e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Oct 12 02:24:36 2020 +0000 Fold in 10.0a8 Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 152 +++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 89eb162..f36b366 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,155 @@ +Tor Browser 10.0a8 -- October 8 2020 + * Android + * Update Fenix to 81.1.2 + * Update Tor to 0.4.4.5 + * Update NoScript to 11.0.46 + * Bug 10394: Let Tor Browser update HTTPS Everywhere + * Bug 11154: Disable TLS 1.0 (and 1.1) by default + * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 17374: Disable 1024-DH Encryption by default + * Bug 21601: Remove unused media.webaudio.enabled pref + * Bug 30682: Disable Intermediate CA Preloading + * Bug 30812: Exempt about: pages from Resist Fingerprinting + * Bug 32886: Separate treatment of @media interaction features for desktop and android + * Bug 33534: Review FF release notes from FF69 to latest (FF78) + * Bug 33594: Disable telemetry collection (Glean) + * Bug 33851: Patch out Parental Controls detection and logging + * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True + * Bug 33862: Fix usages of createTransport API + * Bug 33962: Uplift patch for bug 5741 (dns leak protection) + * Bug 34125: API change in protocolProxyService.registerChannelFilter + * Bug 34338: Disable the crash reporter + * Bug 34377: Port padlock states for .onion services + * Bug 34378: Port external helper app prompting + * Bug 34401: Re-design Connect screen on Android + * Bug 34402: Re-design Network Settings Screen on Android + * Bug 34403: UI changes for "Only Private Browsing Mode" on Android + * Bug 34405: Re-design about:tor on Android + * Bug 34406: Re-design onion indicators for Android + * Bug 34407: Review all Fenix menu items + * Bug 40001: Start Tor as part of the Fenix initialization [fenix] + * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton] + * Bug 40002: Ensure system download manager is not used [android-components] + * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton] + * Bug 40003: Adapt code for L10nRegistry API changes [torbutton] + * Bug 40004: Fix noscript message passing for Firefox 79 [torbutton] + * Bug 40005: Modify WebExtensions Menu [android-components] + * Bug 40006: "Only Private Browsing Mode" on Android [fenix] + * Bug 40006: Add Security Level plumbing [android-components] + * Bug 40007: Port external helper app prompting [android-components] + * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] + * Bug 40008: Style fixes for 78 [torbutton] + * Bug 40009: Change the default search engines [android-components] + * Bug 40010: Verify Sentry is disabled [fenix] + * Bug 40011: Verify Leanplum is disabled [fenix] + * Bug 40011: Hide option for disallowing addons in private mode [android-components] + * Bug 40012: Verify Adjust is disabled [fenix] + * Bug 40013: Timestamp is embedded in extension manifest files [android-components] + * Bug 40013: Verify InstallReferrer is disabled [fenix] + * Bug 40014: Verify Google Ads ID is disabled [fenix] + * Bug 40014: Set correct default Security Level [android-components] + * Bug 40015: Modify Fenix Home Menu [fenix] + * Bug 40016: Modify Fenix Settings Menu [fenix] + * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] + * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] + * Bug 40018: Disable Push functionality [fenix] + * Bug 40019: Ensure missing Adjust token does not throw an exception [fenix] + * Bug 40023: Rebase Tor Browser esr78 patches onto 80 beta [tor-browser] + * Bug 40026: Implement Security Level settings [fenix] + * Bug 40028: Implement bootstrapping and about:tor [fenix] + * Bug 40029: Rebase Fenix patches to 81.1.0b1 [fenix] + * Bug 40030: Install https-everywhere and noscript addons [fenix] + * Bug 40031: Hide Mozilla-specific items on About page [fenix] + * Bug 40032: Disallow Cleartext Traffic [fenix] + * Bug 40034: Disable PWA [fenix] + * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser] + * Bug 40035: Maybe hide Quick Start in release [fenix] + * Bug 40039: Implement Bridge configuration from Connect screen [fenix] + * Bug 40040: Investigate why bootstrapping fails [fenix] + * Bug 40041: Implement Network settings [fenix] + * Bug 40042: Timestamp is embedded in extension manifest files [fenix] + * Bug 40044: Fixup Connect, Onboarding, and Home screens [fenix] + * Bug 40048: Disable various ESR78 features via prefs [tor-browser] + * Bug 40054: Search engines on mobile Tor Browser don't match the desktop ones [fenix] + * Bug 40058: Hide option for disallowing addon in private mode [fenix] + * Bug 40061: Do not show "Send to device" in sharing menu [fenix] + * Bug 40063: Do not sort search engines alphabetically [fenix] + * Bug 40064: Modify Nighty (and Debug) build variants [fenix] + * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build] + * Bug 40066: Enable Snowflake on Beta [fenix] + * Bug 40066: Update existing prefs for ESR 78 [tor-browser] + * Bug 40067: Make date on Fenix about page reproducible [fenix] + * Bug 40069: Add helpers for message passing with extensions [tor-browser] + * Bug 40072: Bug 40072: Disable Tracking Protection [fenix] + * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build] + * Bug 40073: Disable remote Public Suffix List fetching [tor-browser] + * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser] + * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser] + * Bug 40095: Review Mozilla developer notes for 79-81 (including) [tor-browser] + * Bug 40096: Review closed Mozilla bugs between 79-81 (inclusive) for GeckoView [tor-browser] + * Bug 40097: Rebase browser patches to 81.0b1 [tor-browser] + * Bug 40098: Initialize torbutton for Geckoview and make sure its features work as expected in Fenix [tor-browser] + * Bug 40112: Check that caching stylesheets per document group adheres to FPI [tor-browser] + * Bug 40119: Update Fenix dependencies for 81.1.2 [fenix] + * Bug 40124: Implement Network settings [fenix] + * Bug 40125: Geckoview: Expose security level interface [tor-browser] + * Bug 40172: Security UI not updated for non-https .onion pages in Fenix [tor-browser] + * Bug 40173: Initialize security_slider in GeckoView at 4 [tor-browser] + * Translations update + * Build System + * Android + * Bump Go to 1.14.7 + * Bug 33556: Add TBB project for android-components + * Bug 33557: Update Android toolchain for Fenix + * Bug 33558: Update tor-onion-proxy-library to use toolchain for Fenix + * Bug 33559: Update tor-android-service to use toolchain for Fenix + * Bug 33561: Update OpenSSL to use Android NDK 20 + * Bug 33563: Update Tor to use Android NDK 20 + * Bug 33564: Update ZSTD to use Android NDK 20 + * Bug 33626: Add project for GeckoView + * Bug 33670: Update rbm.conf to match NDK 20 + * Bug 33801: Update Go project to use new Android toolchain + * Bug 33833: Update Rust project to use Android NDK 20 + * Bug 33927: Add tor-browser-build project for fenix + * Bug 33935: Fenix's classes5.dex files are not reproducible + * Bug 33973: Create fat .aar for GeckoView + * Bug 34011: Bump clang to 9.0.1 + * Bug 34012: Bump cbindgen to 0.14.3 + * Bug 34013: Bump Node to 10.21.0 + * Bug 34014: Enable sqlite3 support in Python + * Bug 34101: Add tor-browser-build project for application-services + * Bug 34163: testbuild target is broken for Tor Browser 64 bit + * Bug 34187: Update zlib to use Android NDK 20 + * Bug 40010: Add nss project for application-services [tor-browser-build] + * Bug 40011: Add sqlcipher for application-services [tor-browser-build] + * Bug 40029: Clean-up all projects to remove fennec bits we don't need for fenix [tor-browser-build] + * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] + * Bug 40039: Remove version_path in nss project [tor-browser-build] + * Bug 40040: Wire geckoview, application-services, android-components, and fenix together [tor-browser-build] + * Bug 40054: Adapt build.android script in tor-browser project for fenix [tor-browser-build] + * Bug 40055: Integrate building Glean in offline mode [tor-browser-build] + * Bug 40057: Include translations into build process in the fenix world [tor-browser-build] + * Bug 40058: Build Fenix with tor-android-service and tor-onion-proxy-library [tor-browser-build] + * Bug 40060: Set Fenix Version Name in build [tor-browser-build] + * Bug 40061: Remove Android SDK 28 [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40068: Bump versions for Fenix 81.1.0b1 dependencies [tor-browser-build] + * Bug 40072: Tor libraries are missing in final .apk after switch to 81.1.0b1 [tor-browser-build] + * Bug 40076: Use our android-components repo on GitLab [tor-browser-build] + * Bug 40078: Bump Gradle version for Fenix to 6.5.1 [tor-browser-build] + * Bug 40084: Generation of AndroidManifest.xml is not reproducible [tor-browser-build] + * Bug 40085+40086: classes.dex files are not reproducible in Fenix [tor-browser-build] + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] + * Bug 40088+40117: Use MOZ_BUILD_DATE for extension manifest timestamps [tor-browser-build] + * Bug 40093: Ensure application-services libs do not include libc networking symbols [tor-browser-build] + * Bug 40094: Aarch64 fenix rust cross-compilation fails [tor-browser-build] + * Bug 40095: The pattern for the apk variable in build.android is matching too much [tor-browser-build] + * Bug 40101: Pick up Fenix 81.1.1 [tor-browser-build] + * Bug 40105: Enhance Gradle dependency script (sort deterministically and exclude .module files) [tor-browser-build] + * Bug 40106: Support using geckoview as well [tor-browser-build] + * Bug 40108: android-components does not bundle tooling-glean-gradle archive, only .pom file [tor-browser-build] + * Bug 40113: Nightly Android should use Nightly branding [tor-browser-build] + Tor Browser 10.5a1 -- September 22 2020 * Windows + OS X + Linux * Update Firefox to 78.3.0esr

1 0

[tor-browser/tor-browser-82.0b7-10.0-1] fixup! squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Oct '20

11 Oct '20

commit 4d3fdb05b66beab2d69765d55e048860ad4daade Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 11 09:25:01 2020 +0000 fixup! squash! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bbfa6c1b9e5a..319cb3e7d872 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -341,7 +341,7 @@ pref("corroborator.enabled", false); // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1667360 and // tor-browser#40140. #ifdef XP_WIN -pref"media.rdd-opus.enabled", false); +pref("media.rdd-opus.enabled", false); #endif // Onboarding.

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Oct '20

11 Oct '20

commit 222c33a8112afb1e8f333a52b37013467d546878 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 11 09:25:01 2020 +0000 fixup! squash! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 2c196761fef1..1218ebfe3d49 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -355,7 +355,7 @@ pref("corroborator.enabled", false); // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1667360 and // tor-browser#40140. #ifdef XP_WIN -pref"media.rdd-opus.enabled", false); +pref("media.rdd-opus.enabled", false); #endif // Onboarding.

1 0