commit fbccad5b7b28a975f2e9de73f8362fcf937db6aa Author: Igor Oliveira <igt0@torproject.org> Date: Tue Nov 13 07:23:52 2018 -0200 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(+) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..2f03bd8e22df --- /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 8a2a356c151c..69714f9eca7c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -426,6 +426,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 df0b09d3bc0f..ba89c51efea1 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -28,6 +28,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 000000000000..ac8d92514940 --- /dev/null +++ b/toolkit/torproject/torbutton @@ -0,0 +1 @@ +Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd