Bug 41211: Replace Google's oss-license-plugin binaries with our patched build

Merge Info

Related Issues

• tor-browser#xxxxx
• mullvad-browser#xxxxx
• #41211 (closed)

Backporting

Timeline

• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport
• No Backport (preferred): patchset for the next major stable

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Other: please explain

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : @clairehurst, @dan
  • build system : @boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : boklm, dan, ma1, morgan, pierov
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : @morgan, pierov

Change Description

In this MR, we create a new project: oss-license-plugin.

We also include two patches:

1. use a TreeSet rather than a HashSet to make the output stable. To do so, I had to implement Comparable on the type used in the Set
2. do a couple of fixes to the build file:
   1. fix incompatibilities with the version of Gradle we use (8.8, currently), in particular the maven plugin has been renamed to maven-publish
   2. use offline dependencies (the mavenLocal() name)
   3. use a local publication, rather than the original one Google implemented (which was also incompatible with our Gradle version, or created some other problems I don't understand, so I deleted it)

How Tested

Built on tb-build-03 and locally, and got matching results.

assigned to @pierov

requested review from @morgan

lgtm, gonna try a build

I built as alpha, and fwiw these are my hashes.

Hashes

9ee71bc53f5796df147bf8875a91b9dc5daa075dc996bb549e68825090429fe0  tor-browser-qa-android-aarch64-14.0a2.apk
a2cc64c2fc81f070dd6fa7a651ebeba36f6368df4afd9a2ecb812e23fcd68cfc  tor-browser-qa-android-armv7-14.0a2.apk
13061de644c6b94388ca379d3b1fff900c7d0022d032eb215b13e91bf54c0e04  tor-browser-qa-android-x86-14.0a2.apk
733f88091269354ebde142987b3ed92a48959bf9070e446eca3240e4efe868f2  tor-browser-qa-android-x86_64-14.0a2.apk
41c1ead611a50e9d07b18b8b04c5e907079f7eb4f3830e2ae7b3f6e811d6ef8d  tor-browser-qa-unsign-android-aarch64-14.0a2.bspatch
07d056231803413650620f8bedd49d6ea169cb3cae5ec191f2a03732f148a59d  tor-browser-qa-unsign-android-armv7-14.0a2.bspatch
56564df3bc7e782a578aa8546253e6a765ba9c90a14ab75424ccbc15a84e43e5  tor-browser-qa-unsign-android-x86-14.0a2.bspatch
d6040eefa848afef11b60b9f82a1078161a82615395f815cd00a82ec83d7eedd  tor-browser-qa-unsign-android-x86_64-14.0a2.bspatch
f2c4d79371f7e0b1948e36790baac89b4b69d0278b61d767480327212cba444b  tor-expert-bundle-android-aarch64-14.0a2.tar.gz
fe8b0a101441efdd301101ffceba256402075be2eba74f013b41fedde79ffedc  tor-expert-bundle-android-armv7-14.0a2.tar.gz
b918582ab19efb59970614b6d36a5b373f6a76a6b7211d25e02073d172a7029b  tor-expert-bundle-android-x86-14.0a2.tar.gz
3e7c0a0603a9917d7de19904c1a89748c1a0f3c186596694d7b03a0ad1e2f193  tor-expert-bundle-android-x86_64-14.0a2.tar.gz

9ee71bc53f5796df147bf8875a91b9dc5daa075dc996bb549e68825090429fe0  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-android-aarch64-14.0a2.apk
a2cc64c2fc81f070dd6fa7a651ebeba36f6368df4afd9a2ecb812e23fcd68cfc  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-android-armv7-14.0a2.apk
13061de644c6b94388ca379d3b1fff900c7d0022d032eb215b13e91bf54c0e04  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-android-x86-14.0a2.apk
733f88091269354ebde142987b3ed92a48959bf9070e446eca3240e4efe868f2  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-android-x86_64-14.0a2.apk
41c1ead611a50e9d07b18b8b04c5e907079f7eb4f3830e2ae7b3f6e811d6ef8d  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-unsign-android-aarch64-14.0a2.bspatch
07d056231803413650620f8bedd49d6ea169cb3cae5ec191f2a03732f148a59d  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-unsign-android-armv7-14.0a2.bspatch
56564df3bc7e782a578aa8546253e6a765ba9c90a14ab75424ccbc15a84e43e5  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-unsign-android-x86-14.0a2.bspatch
d6040eefa848afef11b60b9f82a1078161a82615395f815cd00a82ec83d7eedd  torbrowser/alpha/unsigned/14.0a2-build1/tor-browser-qa-unsign-android-x86_64-14.0a2.bspatch
f2c4d79371f7e0b1948e36790baac89b4b69d0278b61d767480327212cba444b  torbrowser/alpha/unsigned/14.0a2-build1/tor-expert-bundle-android-aarch64-14.0a2.tar.gz
fe8b0a101441efdd301101ffceba256402075be2eba74f013b41fedde79ffedc  torbrowser/alpha/unsigned/14.0a2-build1/tor-expert-bundle-android-armv7-14.0a2.tar.gz
b918582ab19efb59970614b6d36a5b373f6a76a6b7211d25e02073d172a7029b  torbrowser/alpha/unsigned/14.0a2-build1/tor-expert-bundle-android-x86-14.0a2.tar.gz
3e7c0a0603a9917d7de19904c1a89748c1a0f3c186596694d7b03a0ad1e2f193  torbrowser/alpha/unsigned/14.0a2-build1/tor-expert-bundle-android-x86_64-14.0a2.tar.gz

all matched

lgtm, happy to merge pending reproducibility

resolved all threads

approved this merge request

merged