From ca0ffb0e19ff39c91bff397644a6aeb2cb6fd432 Mon Sep 17 00:00:00 2001 From: Pale Moon Date: Fri, 9 Sep 2016 15:06:44 +0200 Subject: [PATCH] Revert "Take files out of preprocessing that do not actually have preprocessing directives" This reverts commit 760ef63cd8def888a1c2a6d52ac84c32f7f89f0b. --- browser/base/jar.mn | 14 +++++++------- browser/branding/official/locales/jar.mn | 4 ++-- browser/components/moz.build | 3 +-- browser/components/places/moz.build | 4 +++- toolkit/content/jar.mn | 2 +- toolkit/modules/moz.build | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 42b56a91eb..72ce0e68d8 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -52,15 +52,15 @@ browser.jar: * content/browser/browser.css (content/browser.css) content/browser/browser-menudragging.xul (content/browser-menudragging.xul) content/browser/browser-menudragging.js (content/browser-menudragging.js) - content/browser/browser-title.css (content/browser-title.css) +* content/browser/browser-title.css (content/browser-title.css) * content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) content/browser/content.js (content/content.js) content/browser/imagedocument.png (content/imagedocument.png) - content/browser/padlock.xul (content/padlock.xul) - content/browser/padlock.js (content/padlock.js) - content/browser/padlock.css (content/padlock.css) +* content/browser/padlock.xul (content/padlock.xul) +* content/browser/padlock.js (content/padlock.js) +* content/browser/padlock.css (content/padlock.css) content/browser/padlock_mod_ev.png (content/padlock_mod_ev.png) content/browser/padlock_mod_https.png (content/padlock_mod_https.png) content/browser/padlock_mod_low.png (content/padlock_mod_low.png) @@ -85,10 +85,10 @@ browser.jar: content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css) content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml) - content/browser/sync/setup.xul (content/sync/setup.xul) +* content/browser/sync/setup.xul (content/sync/setup.xul) content/browser/sync/addDevice.js (content/sync/addDevice.js) content/browser/sync/addDevice.xul (content/sync/addDevice.xul) - content/browser/sync/setup.js (content/sync/setup.js) +* content/browser/sync/setup.js (content/sync/setup.js) content/browser/sync/genericChange.xul (content/sync/genericChange.xul) content/browser/sync/genericChange.js (content/sync/genericChange.js) content/browser/sync/key.xhtml (content/sync/key.xhtml) @@ -101,7 +101,7 @@ browser.jar: #endif content/browser/openLocation.js (content/openLocation.js) content/browser/openLocation.xul (content/openLocation.xul) - content/browser/safeMode.css (content/safeMode.css) +* content/browser/safeMode.css (content/safeMode.css) * content/browser/safeMode.js (content/safeMode.js) * content/browser/safeMode.xul (content/safeMode.xul) * content/browser/sanitize.js (content/sanitize.js) diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn index 731a24bfff..ff8c28c877 100644 --- a/browser/branding/official/locales/jar.mn +++ b/browser/branding/official/locales/jar.mn @@ -7,5 +7,5 @@ @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ locale/branding/brand.dtd (%brand.dtd) - locale/branding/brand.properties (%brand.properties) - locale/branding/browserconfig.properties (browserconfig.properties) +* locale/branding/brand.properties (%brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/browser/components/moz.build b/browser/components/moz.build index bf1953766b..f9fc235fd9 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -35,9 +35,8 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'browsercompsbase' -EXTRA_COMPONENTS += [ 'BrowserComponents.manifest' ] - EXTRA_PP_COMPONENTS += [ + 'BrowserComponents.manifest', 'nsBrowserContentHandler.js', 'nsBrowserGlue.js', ] diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build index 043774cbdb..62ddf5b915 100644 --- a/browser/components/places/moz.build +++ b/browser/components/places/moz.build @@ -9,6 +9,8 @@ JAR_MANIFESTS += ['jar.mn'] EXTRA_COMPONENTS += [ 'BrowserPlaces.manifest', 'PlacesProtocolHandler.js', - 'PlacesUIUtils.jsm', ] +EXTRA_PP_JS_MODULES += [ + 'PlacesUIUtils.jsm', +] diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 8debac151c..cfefe8a04a 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -31,7 +31,7 @@ toolkit.jar: content/global/directionDetector.html content/global/plugins.html content/global/plugins.css - content/global/browser-child.js (browser-child.js) +* content/global/browser-child.js (browser-child.js) content/global/browser-content.js (browser-content.js) *+ content/global/buildconfig.html (buildconfig.html) * content/global/contentAreaUtils.js (contentAreaUtils.js) diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index d7ef00231f..35c9a806ae 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -23,7 +23,6 @@ EXTRA_JS_MODULES += [ 'FileUtils.jsm', 'Finder.jsm', 'Geometry.jsm', - 'GMPUtils.jsm', 'Http.jsm', 'InlineSpellChecker.jsm', 'InlineSpellCheckerContent.jsm', @@ -65,6 +64,7 @@ EXTRA_JS_MODULES += [ EXTRA_PP_JS_MODULES += [ 'CertUtils.jsm', 'GMPInstallManager.jsm', + 'GMPUtils.jsm', 'ResetProfile.jsm', 'secondscreen/RokuApp.jsm', 'Services.jsm',