summaryrefslogtreecommitdiffstats
path: root/media/mediaserver/main_mediaserver.cpp
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-06-10 15:12:38 +0100
committerNeil Fuller <nfuller@google.com>2015-06-11 12:59:18 +0100
commit4b60b068c27a40731bd4a0049cb632da18bf521d (patch)
tree9565fcd81affa99e9215abb4b0deda71bf683a35 /media/mediaserver/main_mediaserver.cpp
parent2f3406517d1fd4486b8b90eb2635d784fad17a48 (diff)
downloadframeworks_av-4b60b068c27a40731bd4a0049cb632da18bf521d.zip
frameworks_av-4b60b068c27a40731bd4a0049cb632da18bf521d.tar.gz
frameworks_av-4b60b068c27a40731bd4a0049cb632da18bf521d.tar.bz2
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
Diffstat (limited to 'media/mediaserver/main_mediaserver.cpp')
-rw-r--r--media/mediaserver/main_mediaserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index 27a40b2..4a485ed 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -125,7 +125,7 @@ int main(int argc __unused, char** argv)
prctl(PR_SET_PDEATHSIG, SIGKILL); // if parent media.log dies before me, kill me also
setpgid(0, 0); // but if I die first, don't kill my parent
}
- initializeIcuOrDie();
+ InitializeIcuOrDie();
sp<ProcessState> proc(ProcessState::self());
sp<IServiceManager> sm = defaultServiceManager();
ALOGI("ServiceManager: %p", sm.get());