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

Commit cb676a8e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "mediaextractor: ignore platform's profiler assist signal"" am: 47daf67f 

Change-Id: Id65e7b741330b01e37b85858b8bbe4af63fb19ed
parents 2645a452 47daf67f

services/mediaextractor/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -29,9 +29,6 @@ cc_binary { 
        "liblog",

        "liblog",

        "libavservices_minijail",

        "libavservices_minijail",

    ],

    ],

    header_libs: [

        "bionic_libc_platform_headers",

    ],

    target: {

    target: {

        android: {

        android: {

            product_variables: {

            product_variables: {

services/mediaextractor/main_extractorservice.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <android-base/properties.h>

#include <android-base/properties.h>

#include <utils/misc.h>

#include <utils/misc.h>





#include <bionic/reserved_signals.h>



// from LOCAL_C_INCLUDES

// from LOCAL_C_INCLUDES

#include "MediaExtractorService.h"

#include "MediaExtractorService.h"

#include "MediaUtils.h"

#include "MediaUtils.h"
@@ -51,10 +49,6 @@ int main(int argc __unused, char** argv) 




    signal(SIGPIPE, SIG_IGN);

    signal(SIGPIPE, SIG_IGN);





    // Do not assist platform profilers (relevant only on debug builds).

    // Otherwise, the signal handler can violate the seccomp policy.

    signal(BIONIC_SIGNAL_PROFILER, SIG_IGN);



    //b/62255959: this forces libutis.so to dlopen vendor version of libutils.so

    //b/62255959: this forces libutis.so to dlopen vendor version of libutils.so

    //before minijail is on. This is dirty but required since some syscalls such

    //before minijail is on. This is dirty but required since some syscalls such

    //as pread64 are used by linker but aren't allowed in the minijail. By

    //as pread64 are used by linker but aren't allowed in the minijail. By