From ede03c5e048233b27d6b8e23e1b3b09fc3b24739 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Fri, 6 Jan 2023 16:57:02 +0000
Subject: [PATCH] Remove libandroidicu usage

libandroidicu may be removed in the future.

Bug: 223366263
Bug: 263852499
Test: m droid
Change-Id: I1c2bf1e0c3da7975264d87c1855d964350bda46a
---
 core/jni/Android.bp     | 2 +-
 libs/hwui/jni/Paint.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 681f194d3bd3e..16bc5a3c2f791 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -260,7 +260,6 @@ cc_library_shared {
                 "av-types-aidl-cpp",
                 "android.hardware.camera.device@3.2",
                 "libandroid_net",
-                "libandroidicu",
                 "libbattery",
                 "libnetdutils",
                 "libmemtrack",
@@ -280,6 +279,7 @@ cc_library_shared {
                 "libpermission",
                 "libsensor",
                 "libinput",
+                "libicu",
                 "libcamera_client",
                 "libcamera_metadata",
                 "libprocinfo",
diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index f76863255153b..293e28022e47a 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -35,7 +35,6 @@
 #include "SkShader.h"
 #include "SkBlendMode.h"
 #include "unicode/uloc.h"
-#include "unicode/ushape.h"
 #include "utils/Blur.h"
 
 #include <hwui/BlurDrawLooper.h>