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

Commit 959f8b56 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "mediaserver still needs icu" into nyc-dev

parents a8c00f60 e924b672

media/mediaserver/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libmediaplayerservice \

	libutils \

	libbinder \

	libicuuc \



LOCAL_STATIC_LIBRARIES := \

        libicuandroid_utils \

media/mediaserver/main_mediaserver.cpp

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


// from LOCAL_C_INCLUDES

#include "CameraService.h"

#include "IcuUtils.h"

#include "MediaPlayerService.h"

#include "ResourceManagerService.h"
@@ -38,6 +39,7 @@ int main(int argc __unused, char **argv __unused) 
    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm(defaultServiceManager());

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

    InitializeIcuOrDie();

    MediaPlayerService::instantiate();

    ResourceManagerService::instantiate();

    registerExtensions();