From 1c661cdb86e8db7af6ce30304219a6c160770eaf Mon Sep 17 00:00:00 2001
From: Igor Oliveira <igt0@torproject.org>
Date: Tue, 13 Nov 2018 07:23:52 -0200
Subject: [PATCH] Bug 25013: Add torbutton as a tor-browser submodule

Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.

Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.

Additionally, this patch also fixes Bug 27611.
---
 .gitmodules                                  | 3 +++
 mobile/android/installer/package-manifest.in | 4 ++++
 toolkit/moz.build                            | 3 +++
 toolkit/torproject/torbutton                 | 1 +
 4 files changed, 11 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 toolkit/torproject/torbutton

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000..2f03bd8e22df9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "toolkit/torproject/torbutton"]
+	path = toolkit/torproject/torbutton
+	url = https://git.torproject.org/torbutton.git
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index df14d69739484..816589393562e 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -159,6 +159,10 @@
 @BINPATH@/chrome/devtools@JAREXT@
 @BINPATH@/chrome/devtools.manifest
 
+; Torbutton
+@BINPATH@/chrome/torbutton@JAREXT@
+@BINPATH@/chrome/torbutton.manifest
+
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 #ifdef MOZ_GECKOVIEW_JAR
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 4522d53ba0c32..5419afb74a38c 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -29,6 +29,9 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE'] or CONFIG['MOZ_UPDATER']:
         'mozapps/update/common',
     ]
 
+if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
+    DIRS += ['torproject/torbutton']
+
 if CONFIG['MOZ_MAINTENANCE_SERVICE']:
     DIRS += [
         'components/maintenanceservice'
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
new file mode 160000
index 0000000000000..ac8d925149405
--- /dev/null
+++ b/toolkit/torproject/torbutton
@@ -0,0 +1 @@
+Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd
-- 
GitLab