tor-browser

commit 529e155fe7e6876e806fac9b43c9312ba4b2c181
parent d9d668339bcea640886b8797108a11581cec67bb
Author: André Bargull <andre.bargull@gmail.com>
Date:   Mon, 22 Dec 2025 15:18:00 +0000

Bug 1504045 - Part 2: Add moz.build for js/src/builtin/intl. r=jandem

D276018 has a similar patch, but when trying to land bug 2005531, the header
name conflict on case-insensitive file systems led to a backout because it
busted Windows builds.

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

Diffstat:
A
js/src/builtin/intl/moz.build
 | 
40
++++++++++++++++++++++++++++++++++++++++
M
js/src/moz.build
 | 
27
+--------------------------

2 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/js/src/builtin/intl/moz.build b/js/src/builtin/intl/moz.build
@@ -0,0 +1,40 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+FINAL_LIBRARY = "js"
+
+# Includes should be relative to parent path
+LOCAL_INCLUDES += ["!../..", "../.."]
+
+include("../../js-compileflags.mozbuild")
+include("../../js-config.mozbuild")
+include("../../js-cxxflags.mozbuild")
+
+LOCAL_INCLUDES += [
+    "/intl/icu_capi/bindings/cpp",
+]
+
+UNIFIED_SOURCES += [
+    "Collator.cpp",
+    "CommonFunctions.cpp",
+    "DateTimeFormat.cpp",
+    "DisplayNames.cpp",
+    "DurationFormat.cpp",
+    "GlobalIntlData.cpp",
+    "IntlObject.cpp",
+    "LanguageTag.cpp",
+    "ListFormat.cpp",
+    "Locale.cpp",
+    "LocaleNegotiation.cpp",
+    "NumberFormat.cpp",
+    "PluralRules.cpp",
+    "RelativeTimeFormat.cpp",
+    "Segmenter.cpp",
+    "SharedIntlData.cpp",
+]
+
+if CONFIG["FUZZING_JS_FUZZILLI"]:
+    include("/tools/fuzzing/libfuzzer-config.mozbuild")
diff --git a/js/src/moz.build b/js/src/moz.build
@@ -445,26 +445,6 @@ if CONFIG["ENABLE_EXPLICIT_RESOURCE_MANAGEMENT"]:
         "vm/DisposableRecord.cpp",
     ]
 
-if CONFIG["JS_HAS_INTL_API"]:
-    UNIFIED_SOURCES += [
-        "builtin/intl/Collator.cpp",
-        "builtin/intl/CommonFunctions.cpp",
-        "builtin/intl/DateTimeFormat.cpp",
-        "builtin/intl/DisplayNames.cpp",
-        "builtin/intl/DurationFormat.cpp",
-        "builtin/intl/GlobalIntlData.cpp",
-        "builtin/intl/IntlObject.cpp",
-        "builtin/intl/LanguageTag.cpp",
-        "builtin/intl/ListFormat.cpp",
-        "builtin/intl/Locale.cpp",
-        "builtin/intl/LocaleNegotiation.cpp",
-        "builtin/intl/NumberFormat.cpp",
-        "builtin/intl/PluralRules.cpp",
-        "builtin/intl/RelativeTimeFormat.cpp",
-        "builtin/intl/Segmenter.cpp",
-        "builtin/intl/SharedIntlData.cpp",
-    ]
-
 if CONFIG["MOZ_INSTRUMENTS"]:
     OS_LIBS += ["-framework CoreFoundation"]
     SOURCES += [
@@ -491,11 +471,6 @@ else:
         "threading/posix/PosixThread.cpp",
     ]
 
-if CONFIG["JS_HAS_INTL_API"]:
-    LOCAL_INCLUDES += [
-        "/intl/icu_capi/bindings/cpp",
-    ]
-
 if CONFIG["JS_HAS_CTYPES"]:
     SOURCES += [
         "ctypes/CTypes.cpp",
@@ -537,7 +512,7 @@ DIRS += [
 ]
 
 if CONFIG["JS_HAS_INTL_API"]:
-    DIRS += ["builtin/temporal"]
+    DIRS += ["builtin/intl", "builtin/temporal"]
 
 # Bug 1739321 - clang 13+ only emits debuginfo for classes that are actually
 # constructed, and we cheat in a number of cases. The flag exists at least