commit e924b6729bd9c0ef3f043e1f150a1923ecc94999
author Marco Nelissen <marcone@google.com> Thu Feb 18 09:27:35 2016 -0800
committer Marco Nelissen <marcone@google.com> Thu Feb 18 09:27:35 2016 -0800
tree 6c76c37b7c594230c7178497d3d3864935cd102e
parent f25f8410c01922c58d78ec35da420c3b4fed7e38

mediaserver still needs icu

Bug: 26742500
Change-Id: I4c0a124b19c84debdbe6e458b975feb69f7a433f

media/mediaserver/Android.mk

diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index ee99a26..979143c 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -23,6 +23,7 @@
 	libmediaplayerservice \
 	libutils \
 	libbinder \
+	libicuuc \
 
 LOCAL_STATIC_LIBRARIES := \
         libicuandroid_utils \

media/mediaserver/main_mediaserver.cpp

diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index e006e89..e9dede9 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -26,6 +26,7 @@
 
 // from LOCAL_C_INCLUDES
 #include "CameraService.h"
+#include "IcuUtils.h"
 #include "MediaPlayerService.h"
 #include "ResourceManagerService.h"
 
@@ -38,6 +39,7 @@
     sp<ProcessState> proc(ProcessState::self());
     sp<IServiceManager> sm(defaultServiceManager());
     ALOGI("ServiceManager: %p", sm.get());
+    InitializeIcuOrDie();
     MediaPlayerService::instantiate();
     ResourceManagerService::instantiate();
     registerExtensions();