Bug 1347830 - Remove actual list.txt and remaining references. r=flod
authorMichael Kaply <mozilla@kaply.com>
Thu, 16 Mar 2017 10:05:13 -0500
changeset 348157 048e51956b6cda9b275a2506acc535f64dac4480
parent 348156 7a056bd815b20729b11bea90c0d88523d8b79d0f
child 348158 576abf29e19cefe2a68f053245d81a65df46c99b
push id39084
push usermozilla@kaply.com
push dateFri, 17 Mar 2017 15:31:18 +0000
treeherderautoland@048e51956b6c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1347830
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1347830 - Remove actual list.txt and remaining references. r=flod MozReview-Commit-ID: 9sU5SDuqCTu
mobile/android/installer/allowed-dupes.mn
mobile/locales/Makefile.in
mobile/locales/en-US/searchplugins/list.txt
--- a/mobile/android/installer/allowed-dupes.mn
+++ b/mobile/android/installer/allowed-dupes.mn
@@ -40,17 +40,16 @@ chrome/en-US/locale/en-US/browser/search
 chrome/en-US/locale/en-US/browser/searchplugins/amazondotcom.xml
 chrome/en-US/locale/en-US/browser/searchplugins/bolcom-fy-NL.xml
 chrome/en-US/locale/en-US/browser/searchplugins/bolcom-nl.xml
 chrome/en-US/locale/en-US/browser/searchplugins/bing.xml
 chrome/en-US/locale/en-US/browser/searchplugins/duckduckgo.xml
 chrome/en-US/locale/en-US/browser/searchplugins/google-nocodes.xml
 chrome/en-US/locale/en-US/browser/searchplugins/google.xml
 chrome/en-US/locale/en-US/browser/searchplugins/gulesider-mobile-NO.xml
-chrome/en-US/locale/en-US/browser/searchplugins/list.txt
 chrome/en-US/locale/en-US/browser/searchplugins/qwant.xml
 chrome/en-US/locale/en-US/browser/searchplugins/rediff.xml
 chrome/en-US/locale/en-US/browser/searchplugins/twitter.xml
 chrome/en-US/locale/en-US/browser/searchplugins/wikipedia.xml
 chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-es.xml
 chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-fr.xml
 chrome/en-US/locale/en-US/browser/searchplugins/wikipedia-hi.xml
 chrome/en-US/locale/en-US/browser/searchplugins/yahoo.xml
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -50,17 +50,17 @@ plugin-file-array = \
   $(NULL)
 
 ###########################################################################
 plugin_file    = $(firstword $(plugin-file-array))
 plugin-file-ts = $(tgt-gendir)/$(subst $(topsrcdir)/,$(NULL),$(plugin_file)).ts
 
 GARBAGE += $(plugin-file-ts)
 # ---------------------------------------------------------------------------
-# plugin-file-ts track searchlist file used ($path/list.txt)
+# plugin-file-ts track searchlist file used ($path/list.json)
 # and time when the file was last modified.
 ###########################################################################
 plugin-file-ts-preqs = \
   $(call mkdir_deps,$(dir $(plugin-file-ts))) \
   $(plugin_file) \
   $(NULL)
 
 ###########################################################################
deleted file mode 100644
--- a/mobile/locales/en-US/searchplugins/list.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-amazondotcom
-google:hidden
-google-nocodes
-twitter
-wikipedia
-yahoo
-bing
-duckduckgo