summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-11 09:41:53 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-11 09:41:53 -0500
commit84ed7160b122ec5b035f9ddf016c07a89e5e1233 (patch)
tree65b13172eec53a0a03595df100a1aba2a672193a
parentd49ca9fc0fea5b4af766939d934428830cb4af86 (diff)
downloadUXP-84ed7160b122ec5b035f9ddf016c07a89e5e1233.tar
UXP-84ed7160b122ec5b035f9ddf016c07a89e5e1233.tar.gz
UXP-84ed7160b122ec5b035f9ddf016c07a89e5e1233.tar.lz
UXP-84ed7160b122ec5b035f9ddf016c07a89e5e1233.tar.xz
UXP-84ed7160b122ec5b035f9ddf016c07a89e5e1233.zip
Fix Basilisk packaging when not using WebExtensions enabled Add-on Manager
-rw-r--r--browser/installer/allowed-dupes.mn8
-rw-r--r--browser/installer/package-manifest.in6
2 files changed, 14 insertions, 0 deletions
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index 2ea55aff4..366842598 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -202,9 +202,17 @@ chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png
chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png
+chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png
+chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png
+chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png
chrome/toolkit/skin/classic/mozapps/update/buttons.png
chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png
chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
+
components/FxAccountsPush.js
crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index ba7904719..bddca2f29 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -417,10 +417,14 @@
@RESPATH@/components/addonManager.js
@RESPATH@/components/amContentHandler.js
@RESPATH@/components/amInstallTrigger.js
+#ifdef MOZ_WEBEXTENSIONS
@RESPATH@/components/amWebAPI.js
+#endif
@RESPATH@/components/amWebInstallListener.js
@RESPATH@/components/nsBlocklistService.js
+#ifdef MOZ_WEBEXTENSIONS
@RESPATH@/components/nsBlocklistServiceContent.js
+#endif
#ifdef MOZ_UPDATER
@RESPATH@/components/nsUpdateService.manifest
@RESPATH@/components/nsUpdateService.js
@@ -569,9 +573,11 @@
@RESPATH@/components/TestInterfaceJSMaplike.js
#endif
+#ifdef MOZ_WEBEXTENSIONS
; [Extensions]
@RESPATH@/components/extensions-toolkit.manifest
@RESPATH@/browser/components/extensions-browser.manifest
+#endif
; Modules
@RESPATH@/browser/modules/*