From 8b866db0f8173de212a5a94e033ba5cfa34eefd6 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Wed, 11 Jan 2023 17:46:18 -0500
Subject: [PATCH] [web] Use our own icu_bidi

---
 third_party/canvaskit/BUILD.gn          |  1 +
 third_party/canvaskit/icu_bidi/BUILD.gn | 53 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 third_party/canvaskit/icu_bidi/BUILD.gn

diff --git a/third_party/canvaskit/BUILD.gn b/third_party/canvaskit/BUILD.gn
index 45ab6a223da00..429af65e42c24 100644
--- a/third_party/canvaskit/BUILD.gn
+++ b/third_party/canvaskit/BUILD.gn
@@ -26,6 +26,7 @@ if (build_canvaskit_chromium) {
     extra_toolchain_args = {
       skia_use_icu = false
       skia_use_client_icu = true
+      skia_icu_bidi_third_party_dir = "//flutter/third_party/canvaskit/icu_bidi"
     }
   }
 
diff --git a/third_party/canvaskit/icu_bidi/BUILD.gn b/third_party/canvaskit/icu_bidi/BUILD.gn
new file mode 100644
index 0000000000000..79628ef6755ea
--- /dev/null
+++ b/third_party/canvaskit/icu_bidi/BUILD.gn
@@ -0,0 +1,53 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+public_include_dirs = [
+  "//third_party/icu/source/common",
+  "//third_party/icu/source/i18n",
+]
+
+config("icu_bidi_public") {
+  include_dirs = public_include_dirs
+  defines = [
+    "U_USING_ICU_NAMESPACE=0",
+    "U_DISABLE_RENAMING=0",
+    "U_HAVE_LIB_SUFFIX=1",
+    "U_LIB_SUFFIX_C_NAME=_skia",
+    "U_DISABLE_VERSION_SUFFIX=1",
+    "SK_USING_THIRD_PARTY_ICU",
+  ]
+  cflags = []
+
+  foreach(dir, include_dirs) {
+    cflags += [
+      "-isystem",
+      rebase_path(dir),
+    ]
+  }
+}
+
+static_library("icu_bidi") {
+  defines = [
+    "U_COMMON_IMPLEMENTATION",
+    "U_STATIC_IMPLEMENTATION",
+    "U_I18N_IMPLEMENTATION",
+  ]
+  sources = [
+    "//third_party/icu/source/common/cmemory.cpp",
+    "//third_party/icu/source/common/cstring.cpp",
+    "//third_party/icu/source/common/ubidi.cpp",
+    "//third_party/icu/source/common/ubidi_props.cpp",
+    "//third_party/icu/source/common/ubidiln.cpp",
+    "//third_party/icu/source/common/ubidiwrt.cpp",
+    "//third_party/icu/source/common/uchar.cpp",
+    "//third_party/icu/source/common/udataswp.cpp",
+    "//third_party/icu/source/common/uinvchar.cpp",
+    "//third_party/icu/source/common/ustring.cpp",
+    "//third_party/icu/source/common/ustrtrns.cpp",
+    "//third_party/icu/source/common/utf_impl.cpp",
+    "//third_party/icu/source/common/utrie2.cpp",
+  ]
+  public_configs = [ ":icu_bidi_public" ]
+  cflags = [ "-w" ]
+}