diff options
| author | Gaming4JC <g4jc@bulletmail.org> | 2018-05-27 23:02:08 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@bulletmail.org> | 2018-05-27 23:02:08 -0400 |
| commit | 9b16611deafe56250478af711fe6d0cac6c6ec71 (patch) | |
| tree | a4cbb5cc06abeaa2e424560c938e174a74455a4b /installer | |
| parent | aef40971d221980ee602f36373d8e79c5e64d3c3 (diff) | |
| download | iceweasel-uxp-9b16611deafe56250478af711fe6d0cac6c6ec71.tar.gz | |
disable marionett and remote
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Makefile.in | 6 | ||||
| -rw-r--r-- | installer/package-manifest.in | 24 |
2 files changed, 2 insertions, 28 deletions
diff --git a/installer/Makefile.in b/installer/Makefile.in index 4a934fe..a7016a7 100644 --- a/installer/Makefile.in +++ b/installer/Makefile.in @@ -172,8 +172,4 @@ package-compare:: installer:: ifdef INSTALLER_DIR $(MAKE) -C $(INSTALLER_DIR) -endif - -ifdef ENABLE_MARIONETTE -DEFINES += -DENABLE_MARIONETTE=1 -endif +endif
\ No newline at end of file diff --git a/installer/package-manifest.in b/installer/package-manifest.in index 92d225a..15e2f54 100644 --- a/installer/package-manifest.in +++ b/installer/package-manifest.in @@ -301,9 +301,7 @@ @RESPATH@/components/toolkit_perfmonitoring.xpt @RESPATH@/components/toolkit_xulstore.xpt @RESPATH@/components/toolkitprofile.xpt -#ifdef MOZ_ENABLE_XREMOTE -@RESPATH@/components/toolkitremote.xpt -#endif + @RESPATH@/components/txtsvc.xpt @RESPATH@/components/txmgr.xpt @RESPATH@/components/uconv.xpt @@ -412,11 +410,6 @@ #ifdef MOZ_WEBEXTENSIONS @RESPATH@/components/nsBlocklistServiceContent.js #endif -#ifdef MOZ_UPDATER -@RESPATH@/components/nsUpdateService.manifest -@RESPATH@/components/nsUpdateService.js -@RESPATH@/components/nsUpdateServiceStub.js -#endif @RESPATH@/components/nsUpdateTimerManager.manifest @RESPATH@/components/nsUpdateTimerManager.js @RESPATH@/components/addoncompat.manifest @@ -520,9 +513,6 @@ @RESPATH@/components/Push.manifest @RESPATH@/components/PushComponents.js -@RESPATH@/components/remotebrowserutils.manifest -@RESPATH@/components/RemoteWebNavigation.js - @RESPATH@/components/SlowScriptDebug.manifest @RESPATH@/components/SlowScriptDebug.js @@ -531,11 +521,6 @@ @RESPATH@/components/PeerConnection.manifest #endif -@RESPATH@/chrome/marionette@JAREXT@ -@RESPATH@/chrome/marionette.manifest -@RESPATH@/components/marionette.manifest -@RESPATH@/components/marionette.js - #ifdef MOZ_WEBSPEECH @RESPATH@/components/dom_webspeechsynth.xpt #endif @@ -753,13 +738,6 @@ bin/libfreebl_32int64_3.so @BINPATH@/clang_rt.asan_dynamic-*.dll #endif - -; media -#ifdef MOZ_EME -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/clearkey.info -#endif - ; gfx #ifdef XP_WIN @RESPATH@/components/GfxSanityTest.manifest |