diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:35:14 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:35:14 -0500 |
| commit | ba2c2e5301bb2d993984c62cdf2fd07b361e6bca (patch) | |
| tree | aa7420c3256f4917e427eaa62292cc8b10e378e0 /browser | |
| parent | 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 (diff) | |
| download | uxp-ba2c2e5301bb2d993984c62cdf2fd07b361e6bca.tar.gz | |
Remove MOZ_MULET
Diffstat (limited to 'browser')
| -rw-r--r-- | browser/components/BrowserComponents.manifest | 2 | ||||
| -rw-r--r-- | browser/installer/Makefile.in | 4 | ||||
| -rw-r--r-- | browser/installer/package-manifest.in | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest index dbfc3d2ec4..0c80006beb 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -39,6 +39,4 @@ component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc} category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js -#ifndef MOZ_MULET contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} -#endif diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index ccfce3cd9a..4a934fe45a 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -13,11 +13,7 @@ MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner -ifndef MOZ_MULET MOZ_PKG_FATAL_WARNINGS = 1 -else -DEFINES += -DMOZ_MULET -endif # When packaging an artifact build not all xpt files expected by the # packager will be present. diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index dee6a3faaa..015daa8c7d 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -831,7 +831,3 @@ bin/libfreebl_32int64_3.so @RESPATH@/components/GfxSanityTest.manifest @RESPATH@/components/SanityTest.js #endif - -#ifdef MOZ_MULET -#include ../../b2g/installer/package-manifest.in -#endif |