Revert "Adapt TextLayoutCache for new Harfbuzz scripts"
This reverts commit 7f4ae758ba4724f7c3031d33ad8e749c11d1e059
This CL created a regression:
#5134317 Arabic Keyboard does not appear
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 170957c..6e73889 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -178,7 +178,6 @@
external/icu4c/i18n \
external/icu4c/common \
external/jpeg \
- external/harfbuzz/contrib \
external/harfbuzz/src \
external/zlib \
frameworks/opt/emoji \
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index a29eb38..30fe298 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -17,10 +17,6 @@
#include "TextLayoutCache.h"
#include "TextLayout.h"
-extern "C" {
-#include "harfbuzz-unicode.h"
-}
-
namespace android {
TextLayoutCache::TextLayoutCache() :
@@ -359,9 +355,7 @@
shaperItem->item.pos = start;
shaperItem->item.length = count;
shaperItem->item.bidiLevel = isRTL;
-
- ssize_t iter = 0;
- shaperItem->item.script = code_point_to_script(utf16_to_code_point(chars, count, &iter));
+ shaperItem->item.script = isRTL ? HB_Script_Arabic : HB_Script_Common;
shaperItem->string = chars;
shaperItem->stringLength = contextCount;