Bug 1876590 - Undo platform.ini packaging changes r=nalexander

This reverts commit a70f59c7d9da728a355a38dd4dbbd33d5730d442.

Differential Revision: https://phabricator.services.mozilla.com/D199853

dom/base/nsFrameLoader.cpp

@@ -134,7 +134,6 @@
 #include "mozilla/toolkit/library/buildid_reader_ffi.h"
 #include "nsXPCOMPrivate.h"  // for XUL_DLL
 
-#include "nsSystemInfo.h"
 #include "nsXULPopupManager.h"
 
 #ifdef NS_PRINTING

python/mozbuild/mozbuild/artifacts.py

@@ -562,7 +562,6 @@ class LinuxArtifactJob(ArtifactJob):
         "{product}/{product}-bin",
         "{product}/minidump-analyzer",
         "{product}/pingsender",
-        "{product}/platform.ini",
         "{product}/plugin-container",
         "{product}/updater",
         "{product}/glxtest",
@@ -746,7 +745,6 @@ class MacArtifactJob(ArtifactJob):
                         "gmp-clearkey/0.1/libclearkey.dylib",
                         # 'gmp-fake/1.0/libfake.dylib',
                         # 'gmp-fakeopenh264/1.0/libfakeopenh264.dylib',
-                        "platform.ini",
                     ],
                 )
             ]
@@ -798,7 +796,6 @@ class WinArtifactJob(ArtifactJob):
 
     _package_artifact_patterns = {
         "{product}/dependentlibs.list",
-        "{product}/platform.ini",
         "{product}/**/*.dll",
         "{product}/*.exe",
         "{product}/*.tlb",

toolkit/xre/moz.build

@@ -277,9 +277,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]
 
 DEFINES["TOPOBJDIR"] = TOPOBJDIR
-
-if not CONFIG["MOZ_ARTIFACT_BUILDS"]:
-    FINAL_TARGET_PP_FILES += ["platform.ini"]
+FINAL_TARGET_PP_FILES += ["platform.ini"]
 
 if CONFIG["ENABLE_TESTS"]:
     DIRS += ["test/gtest"]