From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- toolkit/components/resistfingerprinting/moz.build | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'toolkit/components/resistfingerprinting/moz.build') diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build index 6ac25d3b76..9b4e9cc8ed 100644 --- a/toolkit/components/resistfingerprinting/moz.build +++ b/toolkit/components/resistfingerprinting/moz.build @@ -13,6 +13,17 @@ UNIFIED_SOURCES += [ "nsRFPService.cpp", "RelativeTimeline.cpp", ] +# Because nsUserCharacteristics doesn't `use namespace mozilla` (because we're going to wind +# up with a million includes on this file and pollution will get confusing), unified build +# will mask a lot of errors that would cause backouts. This exposes them locally. +SOURCES += [ + "nsUserCharacteristics.cpp", +] + +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": + LOCAL_INCLUDES += [ + "/xpcom/base", + ] SPHINX_TREES["resistfingerprinting"] = "docs" @@ -23,6 +34,7 @@ EXPORTS.mozilla += [ "RelativeTimeline.h", "RFPTargetIPCUtils.h", ] +EXPORTS.mozilla.gtest += ["nsUserCharacteristics.h"] EXTRA_JS_MODULES += [ "FingerprintingWebCompatService.sys.mjs", -- cgit v1.2.3