This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 28020af1754e41f3d63bd0cd84d1117fab55a1d5 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Oct 3 12:35:48 2022 +0200
fixup! Bug 40925: Implemented the Security Level component
Bug 41308: Moved the Security Level backend to include it also on Android --- browser/components/securitylevel/moz.build | 12 ------------ browser/installer/package-manifest.in | 2 +- mobile/android/installer/package-manifest.in | 3 +++ toolkit/components/moz.build | 1 + .../components/securitylevel/SecurityLevel.jsm | 0 .../components/securitylevel/SecurityLevel.manifest | 0 .../components/securitylevel/components.conf | 2 +- {browser => toolkit}/components/securitylevel/moz.build | 2 -- 8 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/browser/components/securitylevel/moz.build b/browser/components/securitylevel/moz.build index 33573a3706f9..2661ad7cb9f3 100644 --- a/browser/components/securitylevel/moz.build +++ b/browser/components/securitylevel/moz.build @@ -1,13 +1 @@ JAR_MANIFESTS += ["jar.mn"] - -EXTRA_JS_MODULES += [ - "SecurityLevel.jsm", -] - -XPCOM_MANIFESTS += [ - "components.conf", -] - -EXTRA_COMPONENTS += [ - "SecurityLevel.manifest", -] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 1cffb5564030..c84928e45c15 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -259,7 +259,7 @@ @RESPATH@/browser/chrome/newidentity/ @RESPATH@/browser/chrome/securitylevel.manifest @RESPATH@/browser/chrome/securitylevel/ -@RESPATH@/browser/components/SecurityLevel.manifest +@RESPATH@/components/SecurityLevel.manifest
; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 29ffe95fa27c..ead4a138d927 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -134,6 +134,9 @@ @BINPATH@/chrome/devtools@JAREXT@ @BINPATH@/chrome/devtools.manifest
+; Base Browser +@BINPATH@/components/SecurityLevel.manifest + ; Torbutton @BINPATH@/chrome/torbutton@JAREXT@ @BINPATH@/chrome/torbutton.manifest diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 4e88cf68d22c..86a289d2c71d 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -66,6 +66,7 @@ DIRS += [ "reputationservice", "resistfingerprinting", "search", + "securitylevel", "sessionstore", "shell", "startup", diff --git a/browser/components/securitylevel/SecurityLevel.jsm b/toolkit/components/securitylevel/SecurityLevel.jsm similarity index 100% rename from browser/components/securitylevel/SecurityLevel.jsm rename to toolkit/components/securitylevel/SecurityLevel.jsm diff --git a/browser/components/securitylevel/SecurityLevel.manifest b/toolkit/components/securitylevel/SecurityLevel.manifest similarity index 100% rename from browser/components/securitylevel/SecurityLevel.manifest rename to toolkit/components/securitylevel/SecurityLevel.manifest diff --git a/browser/components/securitylevel/components.conf b/toolkit/components/securitylevel/components.conf similarity index 77% rename from browser/components/securitylevel/components.conf rename to toolkit/components/securitylevel/components.conf index 4b9263ce7f0f..d25c9f994071 100644 --- a/browser/components/securitylevel/components.conf +++ b/toolkit/components/securitylevel/components.conf @@ -4,7 +4,7 @@ Classes = [ "contract_ids": [ "@torproject.org/security-level;1", ], - "jsm": "resource:///modules/SecurityLevel.jsm", + "jsm": "resource://gre/modules/SecurityLevel.jsm", "constructor": "SecurityLevel", } ] diff --git a/browser/components/securitylevel/moz.build b/toolkit/components/securitylevel/moz.build similarity index 83% copy from browser/components/securitylevel/moz.build copy to toolkit/components/securitylevel/moz.build index 33573a3706f9..576ee1e1f536 100644 --- a/browser/components/securitylevel/moz.build +++ b/toolkit/components/securitylevel/moz.build @@ -1,5 +1,3 @@ -JAR_MANIFESTS += ["jar.mn"] - EXTRA_JS_MODULES += [ "SecurityLevel.jsm", ]