From 250390c7a4714a8d990fbdb45072e54b468e028d Mon Sep 17 00:00:00 2001 From: NTD Date: Sun, 11 Feb 2018 09:41:53 -0500 Subject: [PATCH] Fix Basilisk packaging when not using WebExtensions enabled Add-on Manager --- browser/installer/allowed-dupes.mn | 8 ++++++++ browser/installer/package-manifest.in | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 2ea55aff4b..3668425984 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 ba7904719a..bddca2f294 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/*