commit f0ade8a687eed811447df175f10fa159eb670cb7
author Julia Lavrova <jlavrova@google.com> Fri Nov 08 12:58:57 2019 -0500
committer Ben Wagner <bungeman@google.com> Fri Nov 08 18:59:03 2019 +0000
tree c287568d80316a119bf243c85cec706e5d805bcd
parent 052a05ac3a125d5085d98311071c0c3e517bb24e

Fixing no icu situation

Change-Id: I9763a0a2a0ee231500b27c11e17e0f5f4df44f29
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253683
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

modules/skparagraph/src/OneLineShaper.cpp

diff --git a/modules/skparagraph/src/OneLineShaper.cpp b/modules/skparagraph/src/OneLineShaper.cpp
index a22fd95..aeaa0a6 100644
--- a/modules/skparagraph/src/OneLineShaper.cpp
+++ b/modules/skparagraph/src/OneLineShaper.cpp
@@ -471,7 +471,10 @@
 
         // Set up the shaper and shape the next
         auto shaper = SkShaper::MakeShapeDontWrapOrReorder();
-        SkASSERT_RELEASE(shaper != nullptr);
+        if (shaper == nullptr) {
+            // For instance, loadICU does not work. We have to stop the process
+            return false;
+        }
 
         iterateThroughFontStyles(styleSpan,
                 [this, &shaper, textDirection, limitlessWidth, &advanceX](Block block) {

public.bzl

diff --git a/public.bzl b/public.bzl
index 2ff1632..d8a1167 100644
--- a/public.bzl
+++ b/public.bzl
@@ -518,6 +518,7 @@
         "gm/video_decoder.cpp",
         "tests/FontMgrAndroidParserTest.cpp",  # Android-only.
         "tests/FontMgrFontConfigTest.cpp",  # FontConfig-only.
+        "tests/SkParagraphTest.cpp",  # Skipping tests for now.
         "tests/skia_test.cpp",  # Old main.
         "tools/gpu/atlastext/*",
         "tools/gpu/dawn/*",