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

Commit 90fe2b88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable CFI for additional media components."

parents 25b1328f acf147e8

media/libstagefright/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) 
LOCAL_CFLAGS += -DENABLE_STAGEFRIGHT_EXPERIMENTS

endif



LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_MODULE:= libstagefright

media/libstagefright/colorconversion/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ LOCAL_STATIC_LIBRARIES := \ 
        libyuv_static \



LOCAL_CFLAGS += -Werror

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_MODULE:= libstagefright_color_conversion

media/libstagefright/filters/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -29,4 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE:= libstagefright_mediafilter



LOCAL_SANITIZE := cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/id3/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ LOCAL_SRC_FILES := \ 
	ID3.cpp



LOCAL_CFLAGS += -Werror -Wall

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_SHARED_LIBRARIES := libmedia

media/libstagefright/matroska/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/av/media/libstagefright/include \



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow

LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_SHARED_LIBRARIES := libmedia