Bug 1362149 - Support including preloaded lists for url-classifier draft
authorFelipe Gomes <felipc@gmail.com>
Thu, 18 May 2017 14:56:55 -0300
changeset 580524 1ae7d2cdb61387354e97e2edea3b3972202ac15d
parent 579653 85e5d15c31691c89b82d6068c26260416493071f
child 580846 8a980c64e1175318202bb919f4b26a5601661b2e
push id59602
push userfelipc@gmail.com
push dateThu, 18 May 2017 17:57:15 +0000
bugs1362149
milestone55.0a1
Bug 1362149 - Support including preloaded lists for url-classifier MozReview-Commit-ID: 6V28bs2y1bi
browser/components/moz.build
browser/components/safebrowsing/moz.build
browser/components/safebrowsing/preloaded-lists/felipe.test
browser/components/safebrowsing/preloaded-lists/moz.build
browser/installer/package-manifest.in
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -14,19 +14,16 @@ with Files("tests/browser/browser_conten
     BUG_COMPONENT = ("Firefox", "Site Identity and Permission Panels")
 
 with Files("tests/unit/test_browserGlue_migration_loop_cleanup.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("tests/unit/test_distribution.js"):
     BUG_COMPONENT = ("Firefox", "Distributions")
 
-with Files("safebrowsing/**"):
-    BUG_COMPONENT = ("Toolkit", "Safe Browsing")
-
 with Files('controlcenter/**'):
     BUG_COMPONENT = ('Firefox', 'General')
 
 
 DIRS += [
     'about',
     'contextualidentity',
     'customizableui',
@@ -36,16 +33,17 @@ DIRS += [
     'feeds',
     'migration',
     'newtab',
     'originattributes',
     'places',
     'preferences',
     'privatebrowsing',
     'resistfingerprinting',
+    'safebrowsing',
     'search',
     'sessionstore',
     'shell',
     'selfsupport',
     'syncedtabs',
     'uitour',
     'translation',
 ]
@@ -68,15 +66,14 @@ EXTRA_COMPONENTS += [
     'nsBrowserGlue.js',
 ]
 
 EXTRA_JS_MODULES += [
     'distribution.js',
 ]
 
 BROWSER_CHROME_MANIFESTS += [
-    'safebrowsing/content/test/browser.ini',
     'tests/browser/browser.ini'
 ]
 
 XPCSHELL_TESTS_MANIFESTS += [
     'tests/unit/xpcshell.ini'
 ]
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/moz.build
@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Toolkit", "Safe Browsing")
+
+DIRS += [
+	'preloaded-lists'
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    'content/test/browser.ini',
+]
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/preloaded-lists/felipe.test
@@ -0,0 +1,1 @@
+abc
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/preloaded-lists/moz.build
@@ -0,0 +1,14 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Toolkit", "Safe Browsing")
+
+DIST_SUBDIR = ''
+
+FINAL_TARGET_FILES.defaults.safebrowsing += [
+    'felipe.test',
+]
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -48,16 +48,17 @@
 @RESPATH@/browser/chrome/@AB_CD@@JAREXT@
 @RESPATH@/browser/chrome/@AB_CD@.manifest
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
 #if defined(XP_WIN) || defined(XP_LINUX)
 @RESPATH@/fonts/*
 #endif
+@RESPATH@/defaults/safebrowsing/*
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
 @RESPATH@/update.locale
 @RESPATH@/updater.ini