1 files changed, 5 insertions, 61 deletions
diff --git a/build/application.ini b/build/application.ini
index 8f65421ed..80cad7e9b 100644
--- a/build/application.ini
+++ b/build/application.ini
@@ -1,62 +1,6 @@
-#if MOZ_APP_STATIC_INI
-#ifdef MOZ_BUILD_APP_IS_BROWSER
-; This file is not used. If you modify it and want the application to use
-; your modifications, move it under the browser/ subdirectory and start with
-; the "-app /path/to/browser/application.ini" argument.
-#else
-; This file is not used. If you modify it and want the application to use
-; your modifications, start with the "-app /path/to/application.ini"
-; argument.
-#endif
-#endif
-#if 0
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#endif
+# Global application.ini template is not conducive to a codebase that
+# is used for multiple applications especially if they have multiple
+# branding OR spaces in their Vendor or Name so include one from the
+# application source directory instead.
 #filter substitution
-#include @TOPOBJDIR@/buildid.h
-#include @TOPOBJDIR@/source-repo.h
-[App]
-#ifdef MC_OFFICIAL
-#if defined(MC_PALEMOON) || defined(MC_BASILISK)
-Vendor=Moonchild Productions
-#elif defined(BINOC_BOREALIS)
-Vendor=Binary Outcast
-#else
-Vendor=@MOZ_APP_VENDOR@
-#endif
-#else
-Vendor=@MOZ_APP_VENDOR@
-#endif
-#ifdef MC_PALEMOON
-Name=Pale Moon
-#else
-Name=@MOZ_APP_BASENAME@
-#endif
-RemotingName=@MOZ_APP_REMOTINGNAME@
-#ifdef MOZ_APP_DISPLAYNAME
-CodeName=@MOZ_APP_DISPLAYNAME@
-#endif
-Version=@MOZ_APP_VERSION@
-#ifdef MOZ_APP_PROFILE
-Profile=@MOZ_APP_PROFILE@
-#endif
-BuildID=@MOZ_BUILDID@
-#ifdef MOZ_SOURCE_REPO
-SourceRepository=@MOZ_SOURCE_REPO@
-#endif
-#ifdef MOZ_SOURCE_STAMP
-SourceStamp=@MOZ_SOURCE_STAMP@
-#endif
-ID=@MOZ_APP_ID@
-
-[Gecko]
-MinVersion=@GRE_MILESTONE@
-MaxVersion=@GRE_MILESTONE@
-
-[XRE]
-#ifdef MOZ_PROFILE_MIGRATOR
-EnableProfileMigrator=1
-#endif
-
+#include @TOPSRCDIR@/@MOZ_BUILD_APP@/app/application.ini