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

Commit b5444262 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Switch to use aicu/AIcu.h" 

am: 969975c5

Change-Id: I815d8713a3ad4dc6e71afe83d901b7f5b84bff1f
parents e8fde373 969975c5

media/mediaserver/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ cc_binary { 
    ],



    static_libs: [

        "libicuandroid_utils",

        "libregistermsext",

    ],

media/mediaserver/main_mediaserver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "mediaserver"

//#define LOG_NDEBUG 0



#include <aicu/AIcu.h>

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>
@@ -25,7 +26,6 @@ 
#include "RegisterExtensions.h"



// from LOCAL_C_INCLUDES

#include "IcuUtils.h"

#include "MediaPlayerService.h"

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

    sp<IServiceManager> sm(defaultServiceManager());

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

    InitializeIcuOrDie();

    AIcu_initializeIcuOrDie();

    MediaPlayerService::instantiate();

    ResourceManagerService::instantiate();

    registerExtensions();

services/mediaextractor/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ LOCAL_REQUIRED_MODULES += \ 
LOCAL_SRC_FILES := main_extractorservice.cpp

LOCAL_SHARED_LIBRARIES := libmedia libmediaextractorservice libbinder libutils \

    liblog libbase libandroidicu libavservices_minijail

LOCAL_STATIC_LIBRARIES := libicuandroid_utils

LOCAL_MODULE:= mediaextractor

LOCAL_INIT_RC := mediaextractor.rc

LOCAL_C_INCLUDES := frameworks/av/media/libmedia

services/mediaextractor/main_extractorservice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
** limitations under the License.

*/



#include <aicu/AIcu.h>

#include <fcntl.h>

#include <sys/prctl.h>

#include <sys/wait.h>
@@ -29,7 +30,6 @@ 
#include <utils/misc.h>



// from LOCAL_C_INCLUDES

#include "IcuUtils.h"

#include "MediaExtractorService.h"

#include "MediaExtractorUpdateService.h"

#include "MediaUtils.h"
@@ -59,7 +59,7 @@ int main(int argc __unused, char** argv) 


    SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);



    InitializeIcuOrDie();

    AIcu_initializeIcuOrDie();



    strcpy(argv[0], "media.extractor");

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