Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8477a300 authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Switch to using shared over local code for initializing ICU"

parents ed2abf42 6697ab9e

media/mediaserver/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libaudiopolicyservice \

	libcamera_metadata\

	libcameraservice \

        libicuuc \

	libmedialogservice \

	libcutils \

	libnbaio \
@@ -29,6 +30,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libsoundtriggerservice



LOCAL_STATIC_LIBRARIES := \

        libicuandroid_utils \

        libregistermsext



LOCAL_C_INCLUDES := \

media/mediaserver/main_mediaserver.cpp

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
// from LOCAL_C_INCLUDES

#include "AudioFlinger.h"

#include "CameraService.h"

#include "IcuUtils.h"

#include "MediaLogService.h"

#include "MediaPlayerService.h"

#include "AudioPolicyService.h"
@@ -122,6 +123,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();

        sp<ProcessState> proc(ProcessState::self());

        sp<IServiceManager> sm = defaultServiceManager();

        ALOGI("ServiceManager: %p", sm.get());