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

Commit e2c2b961 authored by Kostya Kortchinsky's avatar Kostya Kortchinsky Committed by Android (Google) Code Review
Browse files

Merge "Enable Scudo for mediaextractor"

parents f11ef77d 5986d79b

services/mediaextractor/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ LOCAL_MODULE:= mediaextractor 
LOCAL_INIT_RC := mediaextractor.rc

LOCAL_C_INCLUDES := frameworks/av/media/libmedia

LOCAL_CFLAGS := -Wall -Werror

LOCAL_SANITIZE := scudo

include $(BUILD_EXECUTABLE)



# service seccomp filter

services/mediaextractor/main_extractorservice.cpp

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ static const char kSystemSeccompPolicyPath[] = 
static const char kVendorSeccompPolicyPath[] =

        "/vendor/etc/seccomp_policy/mediaextractor.policy";



// Disable Scudo's mismatch allocation check, as it is being triggered

// by some third party code.

extern "C" const char *__scudo_default_options() {

    return "DeallocationTypeMismatch=false";

}



int main(int argc __unused, char** argv)

{

    limitProcessMemory(