diff options
| author | Narayan Kamath <narayan@google.com> | 2015-06-09 17:42:34 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-06-10 08:52:17 +0000 |
| commit | 2f3406517d1fd4486b8b90eb2635d784fad17a48 (patch) | |
| tree | 55ff130219cf9ac6b68ebf58b0aa848159852b90 /media/mediaserver/Android.mk | |
| parent | 356f08476db6191cdcbad20caf69d7bd642a09b2 (diff) | |
| download | frameworks_av-2f3406517d1fd4486b8b90eb2635d784fad17a48.zip frameworks_av-2f3406517d1fd4486b8b90eb2635d784fad17a48.tar.gz frameworks_av-2f3406517d1fd4486b8b90eb2635d784fad17a48.tar.bz2 | |
mediaserver : Initialize ICU on startup.
In change 2b29e461c in external/icu, we stopped hardcoding the ICU
data path at compile time to avoid two sets of mappings in zygote forked
processes. This means we'll have to tell ICU where its data is if the
process in question isn't forked from the zygote.
bug: 21705078
Change-Id: I829d9fa34fe8209aa8a6d55145ca26fdf0d934e8
Diffstat (limited to 'media/mediaserver/Android.mk')
| -rw-r--r-- | media/mediaserver/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index ba47172..78dfbb1 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -11,13 +11,15 @@ endif include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - main_mediaserver.cpp + main_mediaserver.cpp \ + icuutils.cpp LOCAL_SHARED_LIBRARIES := \ libaudioflinger \ libaudiopolicyservice \ libcamera_metadata\ libcameraservice \ + libicuuc \ libmedialogservice \ libresourcemanagerservice \ libcutils \ |