Commit b5b1dcef authored by Igor Oliveira's avatar Igor Oliveira Committed by Matthew Finkel
Browse files

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.
parent 64860a36

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "toolkit/torproject/torbutton"]

	path = toolkit/torproject/torbutton

	url = https://git.torproject.org/torbutton.git

mobile/android/installer/package-manifest.in

+4 −0
Original line number Diff line number Diff line
@@ -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

toolkit/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -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'

torbutton @ ac8d9251

Original line number Diff line number Diff line 
Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd