commit 6697ab9e63ef0b631a8a6c5d49f6413b91daaaef
author Neil Fuller <nfuller@google.com> Wed Jun 10 15:12:38 2015 +0100
committer Neil Fuller <nfuller@google.com> Thu Jun 11 13:49:27 2015 +0100
tree 9d036250ff19da7866faf3121639ced609ae7200
parent ed2abf42e155909c8da201a7b8b06e527fe07cfb

Switch to using shared over local code for initializing ICU

A static library now exists in external/icu/android_utils.

Contains cherry-picks from commits:
4b60b068c27a40731bd4a0049cb632da18bf521d
2f3406517d1fd4486b8b90eb2635d784fad17a48

Bug: 21730722

Change-Id: Ibc264ed881465736ce74fa493deb83cc15f9fceb

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 3a280f0..ee703db 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -18,6 +18,7 @@
 	libaudiopolicyservice \
 	libcamera_metadata\
 	libcameraservice \
+        libicuuc \
 	libmedialogservice \
 	libcutils \
 	libnbaio \
@@ -29,7 +30,8 @@
 	libsoundtriggerservice
 
 LOCAL_STATIC_LIBRARIES := \
-	libregistermsext
+        libicuandroid_utils \
+        libregistermsext
 
 LOCAL_C_INCLUDES := \
     frameworks/av/media/libmediaplayerservice \