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

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

Merge "Remove ICU from mediaextractor binary"

parents 04aeb89a 508ef398

services/mediaextractor/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ ifneq (true, $(filter true, $(MALLOC_SVELTE))) 
LOCAL_SHARED_LIBRARIES := libc_scudo

endif

LOCAL_SHARED_LIBRARIES += libmedia libmediaextractorservice libbinder libutils \

    liblog libandroidicu libavservices_minijail

    liblog libavservices_minijail

LOCAL_MODULE:= mediaextractor

LOCAL_INIT_RC := mediaextractor.rc

LOCAL_C_INCLUDES := frameworks/av/media/libmedia

services/mediaextractor/main_extractorservice.cpp

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

*/



#include <aicu/AIcu.h>

#include <fcntl.h>

#include <sys/prctl.h>

#include <sys/wait.h>
@@ -58,8 +57,6 @@ int main(int argc __unused, char** argv) 


    SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);



    AIcu_initializeIcuOrDie();



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

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

    sp<IServiceManager> sm = defaultServiceManager();