Bug 1823514 - Define shared-libraries.h for non-MOZ_GECKO_PROFILER with stubbed methods r=mstange,profiler-reviewers

This patch defines shared-libraries.h header file all the time even when the
MOZ_GECKO_PROFILER is not defined. `SharedLibraryInfo` class now has
stubbed-out implementation-specific methods that are defined in platform
specific cpp files. This allows us to always define the header file which
will let us remove a lot of ifdefs in the following patch.

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

Author: canova

mozglue/baseprofiler/moz.build

@@ -12,7 +12,6 @@
 if CONFIG["MOZ_GECKO_PROFILER"]:
     DEFINES["IMPL_MFBT"] = True
     EXPORTS += [
-        "public/BaseProfilerSharedLibraries.h",
         "public/BaseProfilingStack.h",
     ]
     UNIFIED_SOURCES += [
@@ -76,6 +75,7 @@ GeneratedFile(
 EXPORTS += [
     "!public/ProfilingCategoryList.h",
     "public/BaseProfiler.h",
+    "public/BaseProfilerSharedLibraries.h",
     "public/BaseProfilingCategory.h",
 ]
 

mozglue/baseprofiler/public/BaseProfilerSharedLibraries.h

@@ -9,10 +9,6 @@
 
 #include "BaseProfiler.h"
 
-#ifndef MOZ_GECKO_PROFILER
-#  error Do not #include this header when MOZ_GECKO_PROFILER is not #defined.
-#endif
-
 #include <algorithm>
 #include <stdint.h>
 #include <stdlib.h>
@@ -124,12 +120,23 @@ static bool CompareAddresses(const SharedLibrary& first,
 
 class SharedLibraryInfo {
  public:
+#ifdef MOZ_GECKO_PROFILER
   static SharedLibraryInfo GetInfoForSelf();
-#ifdef XP_WIN
+#  ifdef XP_WIN
   static SharedLibraryInfo GetInfoFromPath(const wchar_t* aPath);
-#endif
+#  endif
 
   static void Initialize();
+#else
+  static SharedLibraryInfo GetInfoForSelf() { return SharedLibraryInfo(); }
+#  ifdef XP_WIN
+  static SharedLibraryInfo GetInfoFromPath(const wchar_t* aPath) {
+    return SharedLibraryInfo();
+  }
+#  endif
+
+  static void Initialize() {}
+#endif
 
   SharedLibraryInfo() {}
 

tools/profiler/moz.build

@@ -14,7 +14,6 @@ if CONFIG["MOZ_GECKO_PROFILER"]:
         "public/GeckoProfilerReporter.h",
         "public/ProfilerChild.h",
         "public/ProfilerCodeAddressService.h",
-        "public/shared-libraries.h",
     ]
     UNIFIED_SOURCES += [
         "core/PageInformation.cpp",
@@ -108,7 +107,7 @@ if CONFIG["MOZ_GECKO_PROFILER"]:
                 "core/PowerCounters-win.cpp",
             ]
             SOURCES += {
-                "core/ETWTools.cpp",
+                "core/ETWTools.cpp",
             }
         SOURCES += [
             "core/ProfilerCPUFreq-win.cpp",
@@ -175,6 +174,7 @@ EXPORTS += [
     "public/ProfilerControl.h",
     "public/ProfilerParent.h",
     "public/ProfilerRustBindings.h",
+    "public/shared-libraries.h",
 ]
 
 EXPORTS.mozilla += [

tools/profiler/public/shared-libraries.h

@@ -7,10 +7,6 @@
 #ifndef SHARED_LIBRARIES_H_
 #define SHARED_LIBRARIES_H_
 
-#ifndef MOZ_GECKO_PROFILER
-#  error This header does not have a useful implementation on your platform!
-#endif
-
 #include "nsNativeCharsetUtils.h"
 #include "nsString.h"
 #include <nsID.h>
@@ -117,12 +113,23 @@ static bool CompareAddresses(const SharedLibrary& first,
 
 class SharedLibraryInfo {
  public:
+#ifdef MOZ_GECKO_PROFILER
   static SharedLibraryInfo GetInfoForSelf();
-#ifdef XP_WIN
+#  ifdef XP_WIN
   static SharedLibraryInfo GetInfoFromPath(const wchar_t* aPath);
-#endif
+#  endif
 
   static void Initialize();
+#else
+  static SharedLibraryInfo GetInfoForSelf() { return SharedLibraryInfo(); }
+#  ifdef XP_WIN
+  static SharedLibraryInfo GetInfoFromPath(const wchar_t* aPath) {
+    return SharedLibraryInfo();
+  }
+#  endif
+
+  static void Initialize() {}
+#endif
 
   void AddSharedLibrary(SharedLibrary entry) { mEntries.push_back(entry); }