[tbb-commits] [tor-browser] 02/10: Revert "Bug 28044: Integrate Tor Launcher into tor-browser"

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit d294beea175deafae4cef7011f0ea8c2d825ef17
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Mon Oct 10 15:23:40 2022 +0200

    Revert "Bug 28044: Integrate Tor Launcher into tor-browser"
    
    This reverts commit 149a3ffb1fce6fbaf1e479bfa6d2463f1d7ce88f.
---
 browser/extensions/moz.build          | 3 ---
 browser/installer/package-manifest.in | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index df3a43a07fd7..39bbc2937271 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -5,6 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ["onboarding"]
-
-if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
-    DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index c84928e45c15..ff87c7e39db8 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -236,11 +236,6 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
-#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
- at RESPATH@/browser/chrome/torlauncher.manifest
- at RESPATH@/browser/chrome/torlauncher/*
- at RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
-#endif
 @RESPATH@/chrome/torbutton.manifest
 @RESPATH@/chrome/torbutton/*
 @RESPATH@/chrome/toolkit at JAREXT@

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.