commit 4b60b068c27a40731bd4a0049cb632da18bf521d
author Neil Fuller <nfuller@google.com> Wed Jun 10 15:12:38 2015 +0100
committer Neil Fuller <nfuller@google.com> Thu Jun 11 12:59:18 2015 +0100
tree 9565fcd81affa99e9215abb4b0deda71bf683a35
parent 2f3406517d1fd4486b8b90eb2635d784fad17a48

Switch to using shared over local code for initializing ICU

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

Bug: 21730722
Change-Id: I8302b585d3c87fd1a975301ceca4ceebaccbcac9

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 78dfbb1..b6de0d9 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -11,8 +11,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-	main_mediaserver.cpp \
-	icuutils.cpp
+	main_mediaserver.cpp
 
 LOCAL_SHARED_LIBRARIES := \
 	libaudioflinger \
@@ -33,6 +32,7 @@
 	libradioservice
 
 LOCAL_STATIC_LIBRARIES := \
+        libicuandroid_utils \
         libregistermsext
 
 LOCAL_C_INCLUDES := \