| 1 | |
| 2 | |
| 3 | @@ -458,13 +458,6 @@
|
| 4 | ]
|
| 5 | }
|
| 6 |
|
| 7 | - copy("copy_icu") {
|
| 8 | - visibility = [ ":*" ]
|
| 9 | - sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
|
| 10 | - outputs =
|
| 11 | - [ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ]
|
| 12 | - }
|
| 13 | -
|
| 14 | action("copy_info_plist") {
|
| 15 | script = "//flutter/build/copy_info_plist.py"
|
| 16 | visibility = [ ":*" ]
|
| 17 | @@ -522,7 +515,6 @@
|
| 18 | deps = [
|
| 19 | ":copy_dylib",
|
| 20 | ":copy_framework_headers",
|
| 21 | - ":copy_icu",
|
| 22 | ":copy_info_plist",
|
| 23 | ":copy_module_map",
|
| 24 | ]
|
| 25 | diff --git a/flutter/impeller/toolkit/interop/BUILD.gn b/flutter/impeller/toolkit/interop/BUILD.gn
|
| 26 | index 500410359d..a78c1fa418 100644
|
| 27 | |
| 28 | |
| 29 | @@ -5,14 +5,6 @@
|
| 30 | import("//flutter/build/zip_bundle.gni")
|
| 31 | import("//flutter/impeller/tools/impeller.gni")
|
| 32 |
|
| 33 | -embed_blob("embedded_icu_data") {
|
| 34 | - symbol_name = "embedded_icu_data"
|
| 35 | - blob = "//flutter/third_party/icu/flutter/icudtl.dat"
|
| 36 | - hdr = "$target_gen_dir/embedded_icu_data.h"
|
| 37 | - cc = "$target_gen_dir/embedded_icu_data.cc"
|
| 38 | - deps = []
|
| 39 | -}
|
| 40 | -
|
| 41 | # The public C/C++ Impeller API.
|
| 42 | impeller_component("interop_api") {
|
| 43 | public = [
|
| 44 | @@ -72,7 +64,6 @@
|
| 45 | ]
|
| 46 |
|
| 47 | public_deps = [
|
| 48 | - ":embedded_icu_data",
|
| 49 | ":interop_api",
|
| 50 | "../../base",
|
| 51 | "../../display_list",
|
| 52 | diff --git a/engine/src/flutter/impeller/toolkit/interop/typography_context.cc b/engine/src/flutter/impeller/toolkit/interop/typography_context.cc
|
| 53 | index ed863fa61e..737d087907 100644
|
| 54 | |
| 55 | |
| 56 | @@ -9,7 +9,6 @@
|
| 57 | #include "flutter/fml/icu_util.h"
|
| 58 | #include "flutter/third_party/txt/src/txt/platform.h"
|
| 59 | #include "impeller/base/validation.h"
|
| 60 | -#include "impeller/toolkit/interop/embedded_icu_data.h"
|
| 61 |
|
| 62 | namespace impeller::interop {
|
| 63 |
|
| 64 | @@ -17,9 +16,7 @@
|
| 65 | : collection_(std::make_shared<txt::FontCollection>()) {
|
| 66 | static std::once_flag sICUInitOnceFlag;
|
| 67 | std::call_once(sICUInitOnceFlag, []() {
|
| 68 | - auto icu_data = std::make_unique<fml::NonOwnedMapping>(
|
| 69 | - impeller_embedded_icu_data_data, impeller_embedded_icu_data_length);
|
| 70 | - fml::icu::InitializeICUFromMapping(std::move(icu_data));
|
| 71 | + fml::icu::InitializeICU("/usr/lib/flutter/icudtl.dat");
|
| 72 | });
|
| 73 | // The fallback for all fonts. Looks in platform specific locations.
|
| 74 | collection_->SetupDefaultFontManager(0u);
|