- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-140.5.0esr-15.0-1] Bug 1985996 - Check spoof english in XMLPrettyPrinter. r=eemeli,smaug
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch base-browser-140.5.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: bcc4aa22 by Pier Angelo Vendrame at 2025-11-26T17:28:28+01:00 Bug 1985996 - Check spoof english in XMLPrettyPrinter. r=eemeli,smaug Differential Revision: https://phabricator.services.mozilla.com/D263100 - - - - - 7 changed files: - dom/l10n/DOMLocalization.cpp - dom/l10n/DOMLocalization.h - dom/l10n/DocumentL10n.cpp - dom/l10n/DocumentL10n.h - dom/xml/nsXMLPrettyPrinter.cpp - intl/l10n/Localization.cpp - intl/l10n/Localization.h Changes: ===================================== dom/l10n/DOMLocalization.cpp ===================================== @@ -47,6 +47,12 @@ DOMLocalization::DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, mMutations = new L10nMutations(this); } +DOMLocalization::DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales) + : Localization(aGlobal, aIsSync, aLocales) { + mMutations = new L10nMutations(this); +} + already_AddRefed<DOMLocalization> DOMLocalization::Constructor( const GlobalObject& aGlobal, const Sequence<dom::OwningUTF8StringOrResourceId>& aResourceIds, ===================================== dom/l10n/DOMLocalization.h ===================================== @@ -118,6 +118,8 @@ class DOMLocalization : public intl::Localization { DOMLocalization(nsIGlobalObject* aGlobal, bool aSync); DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, const intl::ffi::LocalizationRc* aRaw); + DOMLocalization(nsIGlobalObject* aGlobal, bool aSync, + const nsTArray<nsCString>& aLocales); protected: virtual ~DOMLocalization(); ===================================== dom/l10n/DocumentL10n.cpp ===================================== @@ -47,6 +47,19 @@ RefPtr<DocumentL10n> DocumentL10n::Create(Document* aDocument, bool aSync) { return l10n.forget(); } +RefPtr<DocumentL10n> DocumentL10n::Create(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales) { + RefPtr<DocumentL10n> l10n = new DocumentL10n(aDocument, aSync, aLocales); + + IgnoredErrorResult rv; + l10n->mReady = Promise::Create(l10n->mGlobal, rv); + if (NS_WARN_IF(rv.Failed())) { + return nullptr; + } + + return l10n.forget(); +} + DocumentL10n::DocumentL10n(Document* aDocument, bool aSync) : DOMLocalization(aDocument->GetScopeObject(), aSync), mDocument(aDocument), @@ -54,6 +67,14 @@ DocumentL10n::DocumentL10n(Document* aDocument, bool aSync) mContentSink = do_QueryInterface(aDocument->GetCurrentContentSink()); } +DocumentL10n::DocumentL10n(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales) + : DOMLocalization(aDocument->GetScopeObject(), aSync, aLocales), + mDocument(aDocument), + mState(DocumentL10nState::Constructed) { + mContentSink = do_QueryInterface(aDocument->GetCurrentContentSink()); +} + JSObject* DocumentL10n::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { return DocumentL10n_Binding::Wrap(aCx, this, aGivenProto); ===================================== dom/l10n/DocumentL10n.h ===================================== @@ -47,9 +47,13 @@ class DocumentL10n final : public DOMLocalization { NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DocumentL10n, DOMLocalization) static RefPtr<DocumentL10n> Create(Document* aDocument, bool aSync); + static RefPtr<DocumentL10n> Create(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales); protected: explicit DocumentL10n(Document* aDocument, bool aSync); + explicit DocumentL10n(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales); virtual ~DocumentL10n() = default; RefPtr<Document> mDocument; ===================================== dom/xml/nsXMLPrettyPrinter.cpp ===================================== @@ -100,7 +100,13 @@ nsresult nsXMLPrettyPrinter::PrettyPrint(Document* aDocument, // Create a DocumentL10n, as the XML document is not allowed to have one. // Make it sync so that the test for bug 590812 does not require a setTimeout. - RefPtr<DocumentL10n> l10n = DocumentL10n::Create(aDocument, true); + RefPtr<DocumentL10n> l10n; + if (aDocument->ShouldResistFingerprinting(RFPTarget::JSLocale)) { + AutoTArray<nsCString, 1> langs = {nsRFPService::GetSpoofedJSLocale()}; + l10n = DocumentL10n::Create(aDocument, true, langs); + } else { + l10n = DocumentL10n::Create(aDocument, true); + } NS_ENSURE_TRUE(l10n, NS_ERROR_UNEXPECTED); l10n->AddResourceId("dom/XMLPrettyPrint.ftl"_ns); ===================================== intl/l10n/Localization.cpp ===================================== @@ -164,6 +164,14 @@ Localization::Localization(nsIGlobalObject* aGlobal, bool aIsSync, RegisterObservers(); } +Localization::Localization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales) + : mGlobal(aGlobal) { + nsTArray<ffi::GeckoResourceId> resIds; + ffi::localization_new_with_locales(&resIds, aIsSync, nullptr, &aLocales, + getter_AddRefs(mRaw)); +} + /* static */ bool Localization::IsAPIEnabled(JSContext* aCx, JSObject* aObject) { JS::Rooted<JSObject*> obj(aCx, aObject); ===================================== intl/l10n/Localization.h ===================================== @@ -156,6 +156,9 @@ class Localization : public nsIObserver, Localization(nsIGlobalObject* aGlobal, bool aIsSync, const ffi::LocalizationRc* aRaw); + Localization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales); + virtual ~Localization(); void RegisterObservers(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bcc4aa2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bcc4aa2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-145.0a1-16.0-1] fixup! Tweaks to the build system
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch mullvad-browser-145.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 329541f5 by Pier Angelo Vendrame at 2025-11-26T17:27:09+01:00 fixup! Tweaks to the build system TB 44370: Always create target.maven.zip on Android. - - - - - 1 changed file: - mobile/android/mach_commands.py Changes: ===================================== mobile/android/mach_commands.py ===================================== @@ -197,8 +197,7 @@ def android_archive_geckoview(command_context, args): if ret != 0: return ret - if "MOZ_AUTOMATION" in os.environ: - create_maven_archive(command_context.topobjdir) + create_maven_archive(command_context.topobjdir) return 0 View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/329… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/329… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-145.0a1-16.0-1] fixup! Tweaks to the build system
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch base-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: a4067c6f by Pier Angelo Vendrame at 2025-11-26T17:26:22+01:00 fixup! Tweaks to the build system TB 44370: Always create target.maven.zip on Android. - - - - - 1 changed file: - mobile/android/mach_commands.py Changes: ===================================== mobile/android/mach_commands.py ===================================== @@ -197,8 +197,7 @@ def android_archive_geckoview(command_context, args): if ret != 0: return ret - if "MOZ_AUTOMATION" in os.environ: - create_maven_archive(command_context.topobjdir) + create_maven_archive(command_context.topobjdir) return 0 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4067c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4067c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.5.0esr-15.0-1] Bug 1985996 - Check spoof english in XMLPrettyPrinter. r=eemeli,smaug
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch tor-browser-140.5.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 51b4993c by Pier Angelo Vendrame at 2025-11-26T16:14:03+01:00 Bug 1985996 - Check spoof english in XMLPrettyPrinter. r=eemeli,smaug Differential Revision: https://phabricator.services.mozilla.com/D263100 - - - - - 7 changed files: - dom/l10n/DOMLocalization.cpp - dom/l10n/DOMLocalization.h - dom/l10n/DocumentL10n.cpp - dom/l10n/DocumentL10n.h - dom/xml/nsXMLPrettyPrinter.cpp - intl/l10n/Localization.cpp - intl/l10n/Localization.h Changes: ===================================== dom/l10n/DOMLocalization.cpp ===================================== @@ -47,6 +47,12 @@ DOMLocalization::DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, mMutations = new L10nMutations(this); } +DOMLocalization::DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales) + : Localization(aGlobal, aIsSync, aLocales) { + mMutations = new L10nMutations(this); +} + already_AddRefed<DOMLocalization> DOMLocalization::Constructor( const GlobalObject& aGlobal, const Sequence<dom::OwningUTF8StringOrResourceId>& aResourceIds, ===================================== dom/l10n/DOMLocalization.h ===================================== @@ -118,6 +118,8 @@ class DOMLocalization : public intl::Localization { DOMLocalization(nsIGlobalObject* aGlobal, bool aSync); DOMLocalization(nsIGlobalObject* aGlobal, bool aIsSync, const intl::ffi::LocalizationRc* aRaw); + DOMLocalization(nsIGlobalObject* aGlobal, bool aSync, + const nsTArray<nsCString>& aLocales); protected: virtual ~DOMLocalization(); ===================================== dom/l10n/DocumentL10n.cpp ===================================== @@ -47,6 +47,19 @@ RefPtr<DocumentL10n> DocumentL10n::Create(Document* aDocument, bool aSync) { return l10n.forget(); } +RefPtr<DocumentL10n> DocumentL10n::Create(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales) { + RefPtr<DocumentL10n> l10n = new DocumentL10n(aDocument, aSync, aLocales); + + IgnoredErrorResult rv; + l10n->mReady = Promise::Create(l10n->mGlobal, rv); + if (NS_WARN_IF(rv.Failed())) { + return nullptr; + } + + return l10n.forget(); +} + DocumentL10n::DocumentL10n(Document* aDocument, bool aSync) : DOMLocalization(aDocument->GetScopeObject(), aSync), mDocument(aDocument), @@ -54,6 +67,14 @@ DocumentL10n::DocumentL10n(Document* aDocument, bool aSync) mContentSink = do_QueryInterface(aDocument->GetCurrentContentSink()); } +DocumentL10n::DocumentL10n(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales) + : DOMLocalization(aDocument->GetScopeObject(), aSync, aLocales), + mDocument(aDocument), + mState(DocumentL10nState::Constructed) { + mContentSink = do_QueryInterface(aDocument->GetCurrentContentSink()); +} + JSObject* DocumentL10n::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { return DocumentL10n_Binding::Wrap(aCx, this, aGivenProto); ===================================== dom/l10n/DocumentL10n.h ===================================== @@ -47,9 +47,13 @@ class DocumentL10n final : public DOMLocalization { NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DocumentL10n, DOMLocalization) static RefPtr<DocumentL10n> Create(Document* aDocument, bool aSync); + static RefPtr<DocumentL10n> Create(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales); protected: explicit DocumentL10n(Document* aDocument, bool aSync); + explicit DocumentL10n(Document* aDocument, bool aSync, + const nsTArray<nsCString>& aLocales); virtual ~DocumentL10n() = default; RefPtr<Document> mDocument; ===================================== dom/xml/nsXMLPrettyPrinter.cpp ===================================== @@ -100,7 +100,13 @@ nsresult nsXMLPrettyPrinter::PrettyPrint(Document* aDocument, // Create a DocumentL10n, as the XML document is not allowed to have one. // Make it sync so that the test for bug 590812 does not require a setTimeout. - RefPtr<DocumentL10n> l10n = DocumentL10n::Create(aDocument, true); + RefPtr<DocumentL10n> l10n; + if (aDocument->ShouldResistFingerprinting(RFPTarget::JSLocale)) { + AutoTArray<nsCString, 1> langs = {nsRFPService::GetSpoofedJSLocale()}; + l10n = DocumentL10n::Create(aDocument, true, langs); + } else { + l10n = DocumentL10n::Create(aDocument, true); + } NS_ENSURE_TRUE(l10n, NS_ERROR_UNEXPECTED); l10n->AddResourceId("dom/XMLPrettyPrint.ftl"_ns); ===================================== intl/l10n/Localization.cpp ===================================== @@ -164,6 +164,14 @@ Localization::Localization(nsIGlobalObject* aGlobal, bool aIsSync, RegisterObservers(); } +Localization::Localization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales) + : mGlobal(aGlobal) { + nsTArray<ffi::GeckoResourceId> resIds; + ffi::localization_new_with_locales(&resIds, aIsSync, nullptr, &aLocales, + getter_AddRefs(mRaw)); +} + /* static */ bool Localization::IsAPIEnabled(JSContext* aCx, JSObject* aObject) { JS::Rooted<JSObject*> obj(aCx, aObject); ===================================== intl/l10n/Localization.h ===================================== @@ -158,6 +158,9 @@ class Localization : public nsIObserver, Localization(nsIGlobalObject* aGlobal, bool aIsSync, const ffi::LocalizationRc* aRaw); + Localization(nsIGlobalObject* aGlobal, bool aIsSync, + const nsTArray<nsCString>& aLocales); + virtual ~Localization(); void RegisterObservers(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51b4993… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51b4993… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-145.0a1-16.0-1] fixup! Tweaks to the build system
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch tor-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 529b5c85 by Pier Angelo Vendrame at 2025-11-26T16:34:59+01:00 fixup! Tweaks to the build system TB 44370: Always create target.maven.zip on Android. - - - - - 1 changed file: - mobile/android/mach_commands.py Changes: ===================================== mobile/android/mach_commands.py ===================================== @@ -197,8 +197,7 @@ def android_archive_geckoview(command_context, args): if ret != 0: return ret - if "MOZ_AUTOMATION" in os.environ: - create_maven_archive(command_context.topobjdir) + create_maven_archive(command_context.topobjdir) return 0 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/529b5c8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/529b5c8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-145.0a1-16.0-1] fixup! BB 42728: Modify ./mach lint to skip unused linters
by brizental (＠brizental) 26 Nov '25

26 Nov '25

brizental pushed to branch mullvad-browser-145.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 9dcc014c by Beatriz Rizental at 2025-11-26T09:26:49-03:00 fixup! BB 42728: Modify ./mach lint to skip unused linters - - - - - 1 changed file: - python/mozlint/mozlint/cli.py Changes: ===================================== python/mozlint/mozlint/cli.py ===================================== @@ -33,6 +33,7 @@ INACTIVE_LINTERS = [ "rejected-words", "rst", "updatebot", + "typescript", "wpt", ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-145.0a1-16.0-1] fixup! BB 42728: Modify ./mach lint to skip unused linters
by brizental (＠brizental) 26 Nov '25

26 Nov '25

brizental pushed to branch base-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 983c6bcc by Beatriz Rizental at 2025-11-26T09:24:49-03:00 fixup! BB 42728: Modify ./mach lint to skip unused linters - - - - - 1 changed file: - python/mozlint/mozlint/cli.py Changes: ===================================== python/mozlint/mozlint/cli.py ===================================== @@ -33,6 +33,7 @@ INACTIVE_LINTERS = [ "rejected-words", "rst", "updatebot", + "typescript", "wpt", ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/983c6bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/983c6bc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-145.0a1-16.0-1] fixup! TB 42669: [android] Use custom no-op app-services
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch tor-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 576980eb by Pier Angelo Vendrame at 2025-11-26T13:20:27+01:00 fixup! TB 42669: [android] Use custom no-op app-services TB 44360: Bring A-S's patch to NimbusAssembleToolsTask.groovy to Tor Browser. Without this, the offline build in tor-browser-build fails because the plugin tries to pull nimbus-fml from Mozilla's servers. - - - - - 1 changed file: - mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy Changes: ===================================== mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy ===================================== @@ -20,6 +20,12 @@ import org.gradle.api.tasks.Nested import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import java.io.File +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.nio.file.StandardCopyOption + import javax.inject.Inject import groovy.transform.Immutable @@ -84,6 +90,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask { @TaskAction void assembleTools() { + String nimbusFml = System.getenv("NIMBUS_FML") + if (nimbusFml == null || "".equals(nimbusFml)) { + nimbusFml = System.getProperty("nimbusFml") + } + if (nimbusFml != null && !"".equals(nimbusFml)) { + Path source = (new File(nimbusFml)).toPath() + Path dest = fmlBinary.get().asFile.toPath() + Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING) + return + } + def sources = [fetchSpec, *fetchSpec.fallbackSources.get()].collect { new Source(new URI(it.archive.get()), new URI(it.hash.get())) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/576980e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/576980e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-145.0a1-16.0-1] fixup! BB 42728: Modify ./mach lint to skip unused linters
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch tor-browser-145.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: dc87c9ff by Beatriz Rizental at 2025-11-26T09:06:57-03:00 fixup! BB 42728: Modify ./mach lint to skip unused linters - - - - - 1 changed file: - python/mozlint/mozlint/cli.py Changes: ===================================== python/mozlint/mozlint/cli.py ===================================== @@ -33,6 +33,7 @@ INACTIVE_LINTERS = [ "rejected-words", "rst", "updatebot", + "typescript", "wpt", ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc87c9f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc87c9f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41573: Remove UglifyJS.
by Pier Angelo Vendrame (＠pierov) 26 Nov '25

26 Nov '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e7648fda by Pier Angelo Vendrame at 2025-11-26T12:36:38+01:00 Bug 41573: Remove UglifyJS. For Android x86, we switched to UglifyJS as the minifier used by Firefox produced invalid files, but minifying was essential to fit in the limit of the Play Store. Now that we are abandoning support for Android x86, we can remove UglifyJS as well. - - - - - 67c6c152 by Pier Angelo Vendrame at 2025-11-26T12:46:48+01:00 Bug 41573: Drop Android x86 support. Upstream dropped Android x86 support, and we cannot continue it on our own, so we have to follow their decision. - - - - - 21 changed files: - Makefile - README - doc/HACKING.txt - doc/MAKEFILE.txt - projects/browser/build.android - projects/browser/config - projects/geckoview/README.md - projects/geckoview/build_apk - projects/geckoview/config - projects/go/config - projects/release/build - projects/release/config - projects/tor-expert-bundle-aar/build - projects/tor-expert-bundle-aar/config - projects/tor-expert-bundle/config - − projects/uglifyjs/README.md - − projects/uglifyjs/build - − projects/uglifyjs/config - rbm.conf - tools/signing/linux-signer-sign-android-apks - tools/update-responses/update_responses Changes: ===================================== Makefile ===================================== @@ -26,15 +26,12 @@ torbrowser-release-android: submodule-update torbrowser-release-android-armv7: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser -torbrowser-release-android-x86: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target torbrowser +torbrowser-release-android-aarch64: submodule-update + $(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser torbrowser-release-android-x86_64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target torbrowser -torbrowser-release-android-aarch64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser - torbrowser-release-linux-x86_64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target torbrowser @@ -68,15 +65,12 @@ torbrowser-alpha-android: submodule-update torbrowser-alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser -torbrowser-alpha-android-x86: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target torbrowser +torbrowser-alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser torbrowser-alpha-android-x86_64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target torbrowser -torbrowser-alpha-android-aarch64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser - torbrowser-alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target torbrowser @@ -110,15 +104,12 @@ torbrowser-nightly-android: submodule-update torbrowser-nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser -torbrowser-nightly-android-x86: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target torbrowser +torbrowser-nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser torbrowser-nightly-android-x86_64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target torbrowser -torbrowser-nightly-android-aarch64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser - torbrowser-nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target torbrowser @@ -152,15 +143,12 @@ torbrowser-testbuild-android: submodule-update torbrowser-testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser -torbrowser-testbuild-android-x86: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target torbrowser +torbrowser-testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser torbrowser-testbuild-android-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target torbrowser -torbrowser-testbuild-android-aarch64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser - torbrowser-testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target torbrowser @@ -258,15 +246,12 @@ basebrowser-release: submodule-update basebrowser-release-android-armv7: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser -basebrowser-release-android-x86: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target basebrowser +basebrowser-release-android-aarch64: submodule-update + $(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser basebrowser-release-android-x86_64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser -basebrowser-release-android-aarch64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser - basebrowser-release-linux-x86_64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser @@ -294,15 +279,12 @@ basebrowser-alpha: submodule-update basebrowser-alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser -basebrowser-alpha-android-x86: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target basebrowser +basebrowser-alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser basebrowser-alpha-android-x86_64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser -basebrowser-alpha-android-aarch64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser - basebrowser-alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser @@ -330,15 +312,12 @@ basebrowser-nightly: submodule-update basebrowser-nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser -basebrowser-nightly-android-x86: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target basebrowser +basebrowser-nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser basebrowser-nightly-android-x86_64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser -basebrowser-nightly-android-aarch64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser - basebrowser-nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser @@ -366,15 +345,12 @@ basebrowser-testbuild: submodule-update basebrowser-testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser -basebrowser-testbuild-android-x86: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target basebrowser +basebrowser-testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser basebrowser-testbuild-android-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser -basebrowser-testbuild-android-aarch64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser - basebrowser-testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser ===================================== README ===================================== @@ -134,7 +134,6 @@ name to the makefile target: $ make torbrowser-nightly-macos $ make torbrowser-nightly-android-armv7 $ make torbrowser-nightly-android-aarch64 - $ make torbrowser-nightly-android-x86 $ make torbrowser-nightly-android-x86_64 When you want to quickly do a build to test a change, you can use the ===================================== doc/HACKING.txt ===================================== @@ -45,19 +45,18 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-aarch64, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos, - torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86, + torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86_64 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-aarch64, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos, -torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64, -torbrowser-android-x86_64 are special cases. They do not contain options -directly, instead they contain a list of other targets. For instance, the -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux -targets. You should define an option under the linux target if it applies to -Linux on both architectures, or under the linux-x86_64 if it only applies to -the x86_64 architecture. +torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86_64 +are special cases. They do not contain options directly, instead they contain a +list of other targets. For instance, the torbrowser-linux-x86_64 target is +pointing to the linux-x86_64 and linux targets. You should define an option +under the linux target if it applies to Linux on both architectures, or under +the linux-x86_64 if it only applies to the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -160,8 +159,6 @@ $platform should be one of the following: - torbrowser-android-aarch64 - - torbrowser-android-x86 - - torbrowser-android-x86_64 For example, to see tor's build script for linux x86_64 on the alpha ===================================== doc/MAKEFILE.txt ===================================== @@ -15,8 +15,8 @@ Build Tor Browser for the release channel, for all supported platforms directory torbrowser/release/$version. torbrowser-release-{linux-x86_64,linux-aarch64,windows-i686,macos, - android-armv7, android-x86,android-x86_64, - android-aarch64,desktop,android} + android-armv7,android-aarch64,android-x86_64, + desktop,android} -------------------------------------------------------------------- Same as torbrowser-release, for the selected platform only. The "desktop" platform means Linux, Windows and macOS. The "android" platform means @@ -28,8 +28,8 @@ Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory torbrowser/alpha/$version. torbrowser-alpha-{linux-x86_64,linux-aarch64,windows-i686,macos, - android-armv7,android-x86,android-x86_64, - android-aarch64,desktop,android} + android-armv7,android-aarch64,android-x86_64, + desktop,android} ------------------------------------------------------------------ Same as torbrowser-alpha, for the selected platform only. @@ -43,8 +43,8 @@ components. The resulting build can be found in directory torbrowser/nightly/$date torbrowser-nightly-{linux-x86_64,linux-aarch64,windows-i686,macos, - android-armv7,android-x86,android-x86_64, - android-aarch64,desktop,android} + android-armv7,android-aarch64,android-x86_64, + desktop,android} -------------------------------------------------------------------- Same as torbrowser-nightly, for the selected platform only. @@ -57,8 +57,8 @@ editing rbm.local.conf. The resulting build can be found in directory testbuild. torbrowser-testbuild-{linux-x86_64,linux-aarch64,windows-i686,macos, - android-armv7,android-x86,android-x86_64, - android-aarch64,desktop,android} + android-armv7,android-aarch64,android-x86_64, + desktop,android} ----------------------------------------------------------------- Same as torbrowser-testbuild, for the selected platform only. ===================================== projects/browser/build.android ===================================== @@ -2,12 +2,6 @@ [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% IF c("var/android-x86") -%] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %] - export PATH=/var/tmp/dist/node/bin:$PATH - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/uglifyjs') %] -[% END -%] - # Bundle our extension(s). # # NoScript will be copied over to the profile folder @@ -64,11 +58,6 @@ function generate_apk { [% IF c("var/tor-browser") -%] cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/ [% END -%] - [% IF c("var/android-x86") -%] - find actors chrome modules moz-src \ - -name '*.js' -or -name '*.mjs' \ - -exec /var/tmp/dist/uglifyjs/bin/uglifyjs --in-situ {} \; - [% END -%] [% c('zip', { zip_src => [ '.' ], zip_args => '-0 ../assets/omni.ja', ===================================== projects/browser/config ===================================== @@ -158,9 +158,3 @@ input_files: # tor-browser-build#40920 - filename: sort-baseline.py enable: '[% c("var/android") %]' - - project: node - name: node - enable: '[% c("var/android-x86") %]' - - project: uglifyjs - name: uglifyjs - enable: '[% c("var/android-x86") %]' ===================================== projects/geckoview/README.md ===================================== @@ -32,7 +32,7 @@ Instead, we've in tor-browser.git. Notice that it isn't necessary to include all the architectures Mozilla and us -support (currently, aarch64, armv7, x86_64 and x86). +support (currently, aarch64, armv7 and x86_64). The merge automation also supports "merging" one architecture. We use this hack when `var/android_single_arch` is defined, which is the default only in testbuilds. ===================================== projects/geckoview/build_apk ===================================== @@ -11,18 +11,14 @@ tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') % mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/* $outdir/[% project %]/artifacts/armeabi-v7a mkdir -p $outdir/[% project %]/artifacts/arm64-v8a mv $rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/artifacts/* $outdir/[% project %]/artifacts/arm64-v8a - mkdir -p $outdir/[% project %]/artifacts/x86 - mv $rootdir/[% c('input_files_by_name/geckoview_x86') %]/artifacts/* $outdir/[% project %]/artifacts/x86 mkdir -p $outdir/[% project %]/artifacts/x86_64 mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64 [% END -%] # Specify the architectures we want to merge -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86,x86_64 +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64 export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/*.aar export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/*.aar -# Specifying just "x86" is not differentiating enough -export MOZ_ANDROID_FAT_AAR_X86=$rootdir/[% c('input_files_by_name/geckoview_x86') %]/geckoview/*.aar export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/*.aar cd $builddir/[% project %]-[% c("version") %] ===================================== projects/geckoview/config ===================================== @@ -93,11 +93,6 @@ steps: pkg_type: build target_prepend: - torbrowser-android-aarch64 - - name: geckoview_x86 - project: geckoview - pkg_type: build - target_prepend: - - torbrowser-android-x86 - name: geckoview_x86_64 project: geckoview pkg_type: build ===================================== projects/go/config ===================================== @@ -68,18 +68,15 @@ targets: android: var: GOOS: android - android-x86: - var: - GOARCH: 386 - android-x86_64: - var: - GOARCH: amd64 android-armv7: var: GOARCH: arm android-aarch64: var: GOARCH: arm64 + android-x86_64: + var: + GOARCH: amd64 input_files: - project: container-image ===================================== projects/release/build ===================================== @@ -19,9 +19,6 @@ function mv_files { [% IF c("var/browser_platforms/android-armv7") -%] mv_files "[% c('input_files_by_name/android-armv7') %]" [% END -%] -[% IF c("var/browser_platforms/android-x86") -%] - mv_files "[% c('input_files_by_name/android-x86') %]" -[% END -%] [% IF c("var/browser_platforms/android-x86_64") -%] mv_files "[% c('input_files_by_name/android-x86_64') %]" [% END -%] ===================================== projects/release/config ===================================== @@ -36,18 +36,14 @@ targets: var: browser_platforms: android-armv7: 1 - browser-android-x86: + browser-android-aarch64: var: browser_platforms: - android-x86: 1 + android-aarch64: 1 browser-android-x86_64: var: browser_platforms: android-x86_64: 1 - browser-android-aarch64: - var: - browser_platforms: - android-aarch64: 1 browser-linux-x86_64: var: browser_platforms: @@ -158,13 +154,13 @@ input_files: - '[% c("var/build_target") %]' - '[% c("var/browser_type") %]-android-armv7' - - name: android-x86 + - name: android-aarch64 project: browser - enable: '[% c("var/browser_platforms/android-x86") %]' + enable: '[% c("var/browser_platforms/android-aarch64") %]' target: - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - - '[% c("var/browser_type") %]-android-x86' + - '[% c("var/browser_type") %]-android-aarch64' - name: android-x86_64 project: browser @@ -174,14 +170,6 @@ input_files: - '[% c("var/build_target") %]' - '[% c("var/browser_type") %]-android-x86_64' - - name: android-aarch64 - project: browser - enable: '[% c("var/browser_platforms/android-aarch64") %]' - target: - - '[% c("var/containers_target") %]' - - '[% c("var/build_target") %]' - - '[% c("var/browser_type") %]-android-aarch64' - - name: linux-x86_64 project: browser enable: '[% c("var/browser_platforms/linux-x86_64") %]' ===================================== projects/tor-expert-bundle-aar/build ===================================== @@ -12,7 +12,7 @@ mkdir -p $distdir # We take for granted that we can take the manifests from any of the bundles # without having to change it. - [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] + [% FOREACH arch = ['armv7', 'aarch64', 'x86_64'] -%] unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar [% END -%] [% c('zip', { ===================================== projects/tor-expert-bundle-aar/config ===================================== @@ -15,11 +15,6 @@ input_files: target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64' enable: '[% !c("var/android_single_arch") %]' - - project: tor-expert-bundle - name: tor-expert-bundle-x86 - target_replace: - '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86' - enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-x86_64 target_replace: ===================================== projects/tor-expert-bundle/config ===================================== @@ -22,7 +22,7 @@ input_files: project: lyrebird - name: conjure project: conjure - enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]' + enable: '[% !c("var/android-x86_64") %]' - filename: pt_config.json - filename: torrc-defaults enable: '[% !c("var/android") %]' ===================================== projects/uglifyjs/README.md deleted ===================================== @@ -1 +0,0 @@ -This project fetches UglifyJS without any other changes. ===================================== projects/uglifyjs/build deleted ===================================== @@ -1,4 +0,0 @@ -#!/bin/bash -tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] -mv [% project %]-[% c('version') %] [% project %] -tar -caf [% dest_dir %]/[% c("filename") %] [% project %] ===================================== projects/uglifyjs/config deleted ===================================== @@ -1,4 +0,0 @@ -version: 3.19.3 -filename: 'uglifyjs-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -git_hash: 3ea33afc72462a470466473208a33379b7204765 -git_url: https://github.com/mishoo/UglifyJS.git ===================================== rbm.conf ===================================== @@ -83,7 +83,6 @@ var: browser_default_channel: alpha browser_platforms: android-armv7: '[% c("var/browser_platforms/is_android_release") %]' - android-x86: '[% c("var/browser_platforms/is_android_release") %]' android-x86_64: '[% c("var/browser_platforms/is_android_release") %]' android-aarch64: '[% c("var/browser_platforms/is_android_release") %]' linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]' @@ -104,9 +103,8 @@ var: signing_android: | [%- c("var/browser_platforms/android-armv7") || - c("var/browser_platforms/android-x86") || - c("var/browser_platforms/android-x86_64") || - c("var/browser_platforms/android-aarch64") + c("var/browser_platforms/android-aarch64") || + c("var/browser_platforms/android-x86_64") -%] # signing_desktop is used in signing scripts to check if at least # one desktop platform is being signed/published @@ -430,22 +428,6 @@ targets: toolchain_arch: arm abi: armeabi-v7a cross_prefix: armv7a-linux-androideabi - torbrowser-android-x86: - - android-x86 - - android - - torbrowser - basebrowser-android-x86: - - android-x86 - - android - - basebrowser - android-x86: - arch: x86 - var: - android-x86: 1 - osname: android-x86 - toolchain_arch: x86 - abi: x86 - cross_prefix: i686-linux-android torbrowser-android-x86_64: - android-x86_64 - android ===================================== tools/signing/linux-signer-sign-android-apks ===================================== @@ -6,7 +6,7 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" topdir="$script_dir/../.." -ARCHS="armv7 aarch64 x86 x86_64" +ARCHS="armv7 aarch64 x86_64" test "$SIGNING_PROJECTNAME" = 'torvpn' && ARCHS='multiarch' projname=$(project-name) # tbb_version_type, tbb_version and SIGNING_PROJECTNAME are used in ===================================== tools/update-responses/update_responses ===================================== @@ -204,7 +204,7 @@ sub get_perplatform_downloads { $os = $1; } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-(portable-|)${version}.exe$/) { $os = $1; - } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) { + } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-aarch64|android-x86_64)-${version}.apk$/) { $os = $1; } else { next; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0