Bug 1854031 - Part 7. Gecko changes for ICU4X 1.4. r=TYLin

Depends on D193882 Differential Revision: https://phabricator.services.mozilla.com/D193883
dothq · Dec 4, 2023 · 509ad0c · 509ad0c
1 parent ef0c3cc
commit 509ad0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/intl/components/moz.build b/intl/components/moz.build
@@ -81,7 +81,7 @@ if CONFIG["MOZ_ICU4X"]:
         "src/ICU4XGeckoDataProvider.cpp",
     ]
     LOCAL_INCLUDES += [
-        "/third_party/rust/icu_capi/c/include",
+        "/intl/icu_capi/c/include",
     ]
 
 # At the time of this writing the MOZ_HAS_MOZGLUE define must be true in order to

diff --git a/intl/components/src/ICU4XGeckoDataProvider.cpp b/intl/components/src/ICU4XGeckoDataProvider.cpp
@@ -17,7 +17,7 @@ capi::ICU4XDataProvider* GetDataProvider() {
   static std::once_flag sOnce;
 
   std::call_once(sOnce, []() {
-    sICU4XDataProvider = capi::ICU4XDataProvider_create_test();
+    sICU4XDataProvider = capi::ICU4XDataProvider_create_compiled();
   });
 
   return sICU4XDataProvider;

diff --git a/intl/lwbrk/moz.build b/intl/lwbrk/moz.build
@@ -44,14 +44,12 @@ else:
 
 if CONFIG["JS_HAS_INTL_API"] and CONFIG["MOZ_ICU4X"]:
     LOCAL_INCLUDES += [
-        "/third_party/rust/icu_capi/cpp/include",
+        "/intl/icu_capi/cpp/include",
     ]
     # Disable warnings when including C++ headers of ICU4X.
     # - https://github.com/rust-diplomat/diplomat/issues/277
-    # - https://github.com/rust-diplomat/diplomat/issues/335
     CXXFLAGS += [
         "-Wno-mismatched-tags",
-        "-Wno-pessimizing-move",
     ]
 
 FINAL_LIBRARY = "xul"
diff --git a/js/src/make-source-package.py b/js/src/make-source-package.py
@@ -142,7 +142,8 @@ def parse_version(topsrc_dir):
 - /intl/icu/source/tools
 + /intl/icu/**
 
-+ /intl/icu_testdata/**
++ /intl/icu_capi/**
++ /intl/icu_segmenter_data/**
 
 - /intl/components/gtest
 + /intl/components/**