commit d3fb68bc558e03de6394b7db762da67e54327bb6 parent 763fd288773d07260b6d97ff9b92720c53a0239b Author: Ted Campbell <tcampbell@mozilla.com> Date: Thu, 8 Jan 2026 18:07:43 +0000 Bug 2008344 - Use ProfilingCategoryList.h directly in js builds r=sfink,profiler-reviewers,win-reviewers,toolkit-telemetry-reviewers,canaltinova,gstoll This avoids some ordering issues between js export phase and mozglue generate phase. As well, we don't really need two copies of the same file so this is simpler. At the same time, move the few baseprofiler headers that are not already in mozilla/ into that directory. It seems to be a historical accident that we ended up with the split rather than a bonified reason. Differential Revision: https://phabricator.services.mozilla.com/D278064 Diffstat:
46 files changed, 59 insertions(+), 73 deletions(-)
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp @@ -51,9 +51,9 @@ #include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL +#include "mozilla/BaseProfiler.h" #include "mozilla/Sprintf.h" #include "mozilla/StartupTimeline.h" -#include "BaseProfiler.h" #ifdef LIBFUZZER # include "FuzzerDefs.h" diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py @@ -77,7 +77,7 @@ included_inclnames_to_ignore = set( "jit/LIROpsGenerated.h", # generated in $OBJDIR "jit/MIROpsGenerated.h", # generated in $OBJDIR "js/PrefsGenerated.h", # generated in $OBJDIR - "js/ProfilingCategoryList.h", # comes from mozglue/baseprofiler + "mozilla/ProfilingCategoryList.h", # comes from mozglue/baseprofiler "mozilla/glue/Debug.h", # comes from mozglue/misc, shadowed by <mozilla/Debug.h> "jscustomallocator.h", # provided by embedders; allowed to be missing "js-config.h", # generated in $OBJDIR diff --git a/js/public/ProfilingCategory.h b/js/public/ProfilingCategory.h @@ -7,10 +7,10 @@ #ifndef js_ProfilingCategory_h #define js_ProfilingCategory_h -#include "jstypes.h" // JS_PUBLIC_API - // The source lives in mozglue/baseprofiler/public/ProfilingCategoryList.h -#include "js/ProfilingCategoryList.h" // MOZ_PROFILING_CATEGORY_LIST +#include "mozilla/ProfilingCategoryList.h" // MOZ_PROFILING_CATEGORY_LIST + +#include "jstypes.h" // JS_PUBLIC_API namespace JS { diff --git a/js/src/moz.build b/js/src/moz.build @@ -214,12 +214,6 @@ EXPORTS.js += [ "../public/Zone.h", ] -# This lives in mozglue/baseprofiler but we re-publish ourselves to support -# standalone SpiderMonkey configurations. -EXPORTS.js += [ - "!/mozglue/baseprofiler/public/ProfilingCategoryList.h", -] - # Public APIs that are experimental: the precise contour of the APIs may still # change, but they're at least plausible first passes at designing something. # We expose them as-is, buyer beware. diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp @@ -32,7 +32,7 @@ # include <gtk/gtk.h> #endif -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #ifdef LIBFUZZER # include "FuzzerDefs.h" diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp @@ -29,10 +29,10 @@ #include <sys/prctl.h> #include "sqlite3.h" #include "Linker.h" -#include "BaseProfiler.h" #include "application.ini.h" #include "mozilla/arm.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/Bootstrap.h" #include "mozilla/Printf.h" #include "mozilla/ProcessType.h" diff --git a/mozglue/baseprofiler/core/EHABIStackWalk.cpp b/mozglue/baseprofiler/core/EHABIStackWalk.cpp @@ -22,16 +22,15 @@ * standard-layout rules in the former. */ -#include "BaseProfiler.h" - #include "EHABIStackWalk.h" -#include "SharedLibraries.h" #include "platform.h" #include "mozilla/Atomics.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/DebugOnly.h" #include "mozilla/EndianUtils.h" +#include "mozilla/SharedLibraries.h" #include <algorithm> #include <elf.h> diff --git a/mozglue/baseprofiler/core/PageInformation.cpp b/mozglue/baseprofiler/core/PageInformation.cpp @@ -6,8 +6,7 @@ #include "PageInformation.h" -#include "BaseProfiler.h" - +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfileJSONWriter.h" namespace mozilla { diff --git a/mozglue/baseprofiler/core/ProfileBuffer.cpp b/mozglue/baseprofiler/core/ProfileBuffer.cpp @@ -6,7 +6,7 @@ #include "ProfileBuffer.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" namespace mozilla { namespace baseprofiler { diff --git a/mozglue/baseprofiler/core/ProfileBuffer.h b/mozglue/baseprofiler/core/ProfileBuffer.h @@ -8,7 +8,7 @@ #include "ProfileBufferEntry.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/Maybe.h" #include "mozilla/PowerOfTwo.h" #include "mozilla/ProfileBufferChunkManagerSingle.h" diff --git a/mozglue/baseprofiler/core/ProfileBufferEntry.cpp b/mozglue/baseprofiler/core/ProfileBufferEntry.cpp @@ -14,7 +14,7 @@ #include "mozilla/Sprintf.h" #include "mozilla/StackWalk.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfilerMarkers.h" #include "platform.h" #include "ProfileBuffer.h" diff --git a/mozglue/baseprofiler/core/ProfileBufferEntry.h b/mozglue/baseprofiler/core/ProfileBufferEntry.h @@ -7,9 +7,9 @@ #ifndef ProfileBufferEntry_h #define ProfileBufferEntry_h -#include "BaseProfilingCategory.h" #include "gtest/MozGtestFriend.h" #include "mozilla/BaseProfileJSONWriter.h" +#include "mozilla/BaseProfilingCategory.h" #include "mozilla/HashFunctions.h" #include "mozilla/HashTable.h" #include "mozilla/Maybe.h" diff --git a/mozglue/baseprofiler/core/ProfiledThreadData.cpp b/mozglue/baseprofiler/core/ProfiledThreadData.cpp @@ -6,9 +6,9 @@ #include "ProfiledThreadData.h" -#include "BaseProfiler.h" #include "ProfileBuffer.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfileJSONWriter.h" #if defined(GP_OS_darwin) diff --git a/mozglue/baseprofiler/core/ProfilerBacktrace.cpp b/mozglue/baseprofiler/core/ProfilerBacktrace.cpp @@ -6,11 +6,11 @@ #include "ProfilerBacktrace.h" -#include "BaseProfiler.h" #include "ProfileBuffer.h" #include "ProfiledThreadData.h" #include "ThreadInfo.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfileJSONWriter.h" namespace mozilla { diff --git a/mozglue/baseprofiler/core/ProfilingCategory.cpp b/mozglue/baseprofiler/core/ProfilingCategory.cpp @@ -4,7 +4,7 @@ * 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/. */ -#include "BaseProfilingCategory.h" +#include "mozilla/BaseProfilingCategory.h" #include "mozilla/Assertions.h" diff --git a/mozglue/baseprofiler/core/ProfilingStack.cpp b/mozglue/baseprofiler/core/ProfilingStack.cpp @@ -8,10 +8,9 @@ #include <algorithm> +#include "mozilla/BaseProfiler.h" #include "mozilla/IntegerRange.h" -#include "BaseProfiler.h" - namespace mozilla { namespace baseprofiler { diff --git a/mozglue/baseprofiler/core/RegisteredThread.cpp b/mozglue/baseprofiler/core/RegisteredThread.cpp @@ -6,7 +6,7 @@ #include "RegisteredThread.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" namespace mozilla { namespace baseprofiler { diff --git a/mozglue/baseprofiler/core/VTuneProfiler.cpp b/mozglue/baseprofiler/core/VTuneProfiler.cpp @@ -11,7 +11,7 @@ #include "VTuneProfiler.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" namespace mozilla { namespace baseprofiler { diff --git a/mozglue/baseprofiler/core/VTuneProfiler.h b/mozglue/baseprofiler/core/VTuneProfiler.h @@ -24,7 +24,7 @@ #else -# include "BaseProfiler.h" +# include "mozilla/BaseProfiler.h" // This is the regular Intel header, these functions are actually defined for // us inside js/src/vtune by an intel C file which actually dynamically resolves diff --git a/mozglue/baseprofiler/core/platform.cpp b/mozglue/baseprofiler/core/platform.cpp @@ -39,15 +39,18 @@ // #include "memory_hooks.h" #include "mozilla/AutoProfilerLabel.h" #include "mozilla/BaseAndGeckoProfilerDetail.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfilerDetail.h" +#include "mozilla/BaseProfilingCategory.h" #include "mozilla/DoubleConversion.h" -#include "mozilla/Printf.h" #include "mozilla/PodOperations.h" -#include "mozilla/ProfilerBufferSize.h" +#include "mozilla/Printf.h" #include "mozilla/ProfileBufferChunkManagerSingle.h" #include "mozilla/ProfileBufferChunkManagerWithLocalLimit.h" #include "mozilla/ProfileChunkedBuffer.h" +#include "mozilla/ProfilerBufferSize.h" #include "mozilla/Services.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/Span.h" #include "mozilla/StackWalk.h" #ifdef XP_WIN @@ -63,14 +66,11 @@ #include "prdtoa.h" #include "prtime.h" -#include "BaseProfiler.h" -#include "BaseProfilingCategory.h" #include "PageInformation.h" #include "ProfiledThreadData.h" #include "ProfilerBacktrace.h" #include "ProfileBuffer.h" #include "RegisteredThread.h" -#include "SharedLibraries.h" #include "ThreadInfo.h" #include "VTuneProfiler.h" diff --git a/mozglue/baseprofiler/core/platform.h b/mozglue/baseprofiler/core/platform.h @@ -31,7 +31,7 @@ #include "PlatformMacros.h" -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/Atomics.h" #include "mozilla/Logging.h" diff --git a/mozglue/baseprofiler/core/shared-libraries-linux.cc b/mozglue/baseprofiler/core/shared-libraries-linux.cc @@ -4,7 +4,7 @@ * 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/. */ -#include "SharedLibraries.h" +#include "mozilla/SharedLibraries.h" #define PATH_MAX_TOSTRING(x) #x #define PATH_MAX_STRING(x) PATH_MAX_TOSTRING(x) diff --git a/mozglue/baseprofiler/core/shared-libraries-macos.cc b/mozglue/baseprofiler/core/shared-libraries-macos.cc @@ -3,7 +3,7 @@ * 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/. */ -#include "SharedLibraries.h" +#include "mozilla/SharedLibraries.h" #include "platform.h" diff --git a/mozglue/baseprofiler/core/shared-libraries-win32.cc b/mozglue/baseprofiler/core/shared-libraries-win32.cc @@ -5,7 +5,7 @@ #include <windows.h> -#include "SharedLibraries.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/glue/WindowsUnicode.h" #include "mozilla/NativeNt.h" diff --git a/mozglue/baseprofiler/moz.build b/mozglue/baseprofiler/moz.build @@ -62,16 +62,11 @@ GeneratedFile( inputs=["build/profiling_categories.yaml"], ) -EXPORTS += [ - "!public/ProfilingCategoryList.h", - "public/BaseProfiler.h", - "public/BaseProfilingCategory.h", - "public/SharedLibraries.h", -] - EXPORTS.mozilla += [ + "!public/ProfilingCategoryList.h", "public/BaseAndGeckoProfilerDetail.h", "public/BaseProfileJSONWriter.h", + "public/BaseProfiler.h", "public/BaseProfilerCounts.h", "public/BaseProfilerDetail.h", "public/BaseProfilerLabels.h", @@ -82,6 +77,7 @@ EXPORTS.mozilla += [ "public/BaseProfilerRAIIMacro.h", "public/BaseProfilerState.h", "public/BaseProfilerUtils.h", + "public/BaseProfilingCategory.h", "public/FailureLatch.h", "public/Flow.h", "public/leb128iterator.h", @@ -100,6 +96,7 @@ EXPORTS.mozilla += [ "public/ProfilerBufferSize.h", "public/ProgressLogger.h", "public/ProportionValue.h", + "public/SharedLibraries.h", ] UNIFIED_SOURCES += [ diff --git a/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h b/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h @@ -24,8 +24,8 @@ enum class StackCaptureOptions { } -#include "BaseProfileJSONWriter.h" -#include "BaseProfilingCategory.h" +#include "mozilla/BaseProfileJSONWriter.h" +#include "mozilla/BaseProfilingCategory.h" #include "mozilla/Maybe.h" #include "mozilla/ProfileChunkedBuffer.h" #include "mozilla/BaseProfilerState.h" @@ -650,12 +650,12 @@ class MarkerOptions { // Options can be read by their name (without "Marker"), e.g.: `o.ThreadId()`. // Add "Ref" for a non-const reference, e.g.: `o.ThreadIdRef() = ...;` #define FUNCTIONS_ON_MEMBER(NAME) \ - MarkerOptions& Set(Marker##NAME&& a##NAME)& { \ + MarkerOptions& Set(Marker##NAME&& a##NAME) & { \ m##NAME = std::move(a##NAME); \ return *this; \ } \ \ - MarkerOptions&& Set(Marker##NAME&& a##NAME)&& { \ + MarkerOptions&& Set(Marker##NAME&& a##NAME) && { \ m##NAME = std::move(a##NAME); \ return std::move(*this); \ } \ diff --git a/mozglue/baseprofiler/public/BaseProfilingCategory.h b/mozglue/baseprofiler/public/BaseProfilingCategory.h @@ -12,7 +12,7 @@ #include <cstdint> -#include "ProfilingCategoryList.h" +#include "mozilla/ProfilingCategoryList.h" namespace mozilla { namespace baseprofiler { diff --git a/mozglue/baseprofiler/public/BaseProfilingStack.h b/mozglue/baseprofiler/public/BaseProfilingStack.h @@ -11,10 +11,9 @@ # error Do not #include this header when MOZ_GECKO_PROFILER is not #defined. #endif -#include "BaseProfilingCategory.h" - #include "mozilla/Assertions.h" #include "mozilla/Atomics.h" +#include "mozilla/BaseProfilingCategory.h" #include <stdint.h> diff --git a/mozglue/baseprofiler/public/ProfileBufferChunkManagerWithLocalLimit.h b/mozglue/baseprofiler/public/ProfileBufferChunkManagerWithLocalLimit.h @@ -7,7 +7,7 @@ #ifndef ProfileBufferChunkManagerWithLocalLimit_h #define ProfileBufferChunkManagerWithLocalLimit_h -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfilerDetail.h" #include "mozilla/ProfileBufferChunkManager.h" #include "mozilla/ProfileBufferControlledChunkManager.h" diff --git a/mozglue/baseprofiler/public/SharedLibraries.h b/mozglue/baseprofiler/public/SharedLibraries.h @@ -7,7 +7,7 @@ #ifndef SHARED_LIBRARIES_H_ #define SHARED_LIBRARIES_H_ -#include "BaseProfiler.h" +#include "mozilla/BaseProfiler.h" #include <algorithm> #include <stdint.h> diff --git a/mozglue/tests/TestBaseProfiler.cpp b/mozglue/tests/TestBaseProfiler.cpp @@ -4,11 +4,10 @@ * 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/. */ -#include "BaseProfiler.h" - #include "mozilla/Attributes.h" #include "mozilla/BaseAndGeckoProfilerDetail.h" #include "mozilla/BaseProfileJSONWriter.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/BaseProfilerDetail.h" #include "mozilla/FailureLatch.h" #include "mozilla/NotNull.h" diff --git a/toolkit/components/backgroundhangmonitor/HangDetails.cpp b/toolkit/components/backgroundhangmonitor/HangDetails.cpp @@ -18,8 +18,8 @@ #include "mozilla/SchedulerGroup.h" #include "mozilla/GfxMessageUtils.h" // For ParamTraits<GeckoProcessType> #include "mozilla/ResultExtensions.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/Try.h" -#include "SharedLibraries.h" static const char MAGIC[] = "permahangsavev1"; diff --git a/toolkit/components/telemetry/other/ProcessedStack.h b/toolkit/components/telemetry/other/ProcessedStack.h @@ -11,9 +11,9 @@ #include "ipc/IPCMessageUtils.h" #include "ipc/IPCMessageUtilsSpecializations.h" #include "mozilla/ipc/MessageChannel.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/Vector.h" #include "nsStringFwd.h" -#include "SharedLibraries.h" namespace mozilla { namespace Telemetry { diff --git a/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp b/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp @@ -10,11 +10,11 @@ #include "js/Array.h" // JS::NewArrayObject #include "js/PropertyAndElement.h" // JS_DefineElement, JS_DefineProperty, JS_GetProperty #include "jsapi.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/dom/ToJSValue.h" #include "nsITelemetry.h" #include "nsUnicharUtils.h" #include "nsXULAppAPI.h" -#include "SharedLibraries.h" namespace mozilla { namespace Telemetry { diff --git a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp @@ -12,8 +12,8 @@ #pragma warning(pop) #include "Authenticode.h" -#include "BaseProfiler.h" #include "nsWindowsDllInterceptor.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/CmdLineAndEnvUtils.h" #include "mozilla/StackWalk_windows.h" #include "mozilla/TimeStamp.h" diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp @@ -10,6 +10,7 @@ #include "mozilla/AppShutdown.h" #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/Components.h" #include "mozilla/FilePreferences.h" #include "mozilla/ChaosMode.h" @@ -39,7 +40,6 @@ #include "mozilla/glean/ToolkitXreMetrics.h" #include "mozilla/glean/GleanPings.h" #include "mozilla/widget/TextRecognition.h" -#include "BaseProfiler.h" #include "mozJSModuleLoader.h" #include "nsAppRunner.h" diff --git a/tools/profiler/core/EHABIStackWalk.cpp b/tools/profiler/core/EHABIStackWalk.cpp @@ -24,12 +24,12 @@ #include "EHABIStackWalk.h" -#include "SharedLibraries.h" #include "platform.h" #include "mozilla/Atomics.h" #include "mozilla/DebugOnly.h" #include "mozilla/EndianUtils.h" +#include "mozilla/SharedLibraries.h" #include <algorithm> #include <elf.h> diff --git a/tools/profiler/core/ProfileBuffer.cpp b/tools/profiler/core/ProfileBuffer.cpp @@ -6,10 +6,10 @@ #include "ProfileBuffer.h" -#include "BaseProfiler.h" #include "js/ColumnNumber.h" // JS::LimitedColumnNumberOneOrigin #include "js/GCAPI.h" #include "jsfriendapi.h" +#include "mozilla/BaseProfiler.h" #include "nsJSPrincipals.h" #include "nsScriptSecurityManager.h" diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp @@ -59,7 +59,6 @@ #include "nsDebug.h" #include "nsISupports.h" #include "nsXPCOM.h" -#include "SharedLibraries.h" #include "VTuneProfiler.h" #include "ETWTools.h" @@ -70,6 +69,7 @@ #include "mozilla/ArrayAlgorithm.h" #include "mozilla/AutoProfilerLabel.h" #include "mozilla/BaseAndGeckoProfilerDetail.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/CycleCollectedJSContext.h" #include "mozilla/ExtensionPolicyService.h" #include "mozilla/extensions/WebExtensionPolicy.h" @@ -84,6 +84,7 @@ #include "mozilla/ProfileChunkedBuffer.h" #include "mozilla/ProfilerBandwidthCounter.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/Services.h" #include "mozilla/StackWalk.h" #include "mozilla/Try.h" @@ -96,7 +97,6 @@ #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" #include "mozilla/Vector.h" -#include "BaseProfiler.h" #include "nsDirectoryServiceDefs.h" #include "nsDirectoryServiceUtils.h" #include "nsIDocShell.h" diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h @@ -39,11 +39,11 @@ #include "mozilla/ProfileJSONWriter.h" #include "mozilla/ProfilerUtils.h" #include "mozilla/ProgressLogger.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" #include "mozilla/Vector.h" #include "nsString.h" -#include "SharedLibraries.h" #include "ProfileAdditionalInformation.h" #include <cstddef> diff --git a/tools/profiler/docs/markers-guide.rst b/tools/profiler/docs/markers-guide.rst @@ -149,7 +149,7 @@ case the advice is the same but the equivalent headers are from the Base Profile #include "mozilla/BaseProfilerMarkers.h" // Only own/untyped/text markers #include "mozilla/BaseProfilerMarkerTypes.h" // Only common markers - #include "BaseProfiler.h" // Markers and other profiler functions + #include "mozilla/BaseProfiler.h" // Markers and other profiler functions Untyped Markers ^^^^^^^^^^^^^^^ diff --git a/tools/profiler/gecko/nsProfiler.cpp b/tools/profiler/gecko/nsProfiler.cpp @@ -24,6 +24,7 @@ #include "mozilla/JSONStringWriteFuncs.h" #include "mozilla/SchedulerGroup.h" #include "mozilla/Services.h" +#include "mozilla/SharedLibraries.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/TypedArray.h" #include "mozilla/Preferences.h" @@ -37,7 +38,6 @@ #include "nsString.h" #include "nsThreadUtils.h" #include "platform.h" -#include "SharedLibraries.h" #include "zlib.h" #ifndef ANDROID diff --git a/tools/profiler/lul/platform-linux-lul.cpp b/tools/profiler/lul/platform-linux-lul.cpp @@ -8,10 +8,10 @@ #include <time.h> #include "mozilla/ProfilerState.h" +#include "mozilla/SharedLibraries.h" #include "platform.h" #include "PlatformMacros.h" #include "LulMain.h" -#include "SharedLibraries.h" #include "AutoObjectMapper.h" // Contains miscellaneous helpers that are used to connect the Gecko Profiler diff --git a/tools/profiler/public/GeckoProfiler.h b/tools/profiler/public/GeckoProfiler.h @@ -21,8 +21,8 @@ // If your file only uses particular APIs (e.g., only markers), please consider // including only the needed headers instead of this one, to reduce compilation // dependencies. -#include "BaseProfiler.h" #include "ProfileAdditionalInformation.h" +#include "mozilla/BaseProfiler.h" #include "mozilla/ProfilerCounts.h" #include "mozilla/ProfilerLabels.h" #include "mozilla/ProfilerMarkers.h" diff --git a/tools/profiler/public/ProfileAdditionalInformation.h b/tools/profiler/public/ProfileAdditionalInformation.h @@ -14,10 +14,10 @@ #ifndef ProfileAdditionalInformation_h #define ProfileAdditionalInformation_h -#include "SharedLibraries.h" #include "js/Value.h" #include "js/Utility.h" #include "js/ProfilingSources.h" +#include "mozilla/SharedLibraries.h" #include "nsString.h" #include "nsTArray.h" diff --git a/tools/profiler/public/ProfilerControl.h b/tools/profiler/public/ProfilerControl.h @@ -44,8 +44,8 @@ static inline void profiler_lookup_async_signal_dump_directory() {} #else // !MOZ_GECKO_PROFILER -# include "BaseProfiler.h" # include "mozilla/Attributes.h" +# include "mozilla/BaseProfiler.h" # include "mozilla/Maybe.h" # include "mozilla/MozPromise.h" # include "mozilla/PowerOfTwo.h"