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

Commit acf147e8 authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Enable CFI for additional media components. 

Enables CFI for the following components (when built with the global
ENABLE_CFI flag set):
   - media/libstagefright/
   - media/libstagefright/colorconversion/
   - media/libstagefright/filters/
   - media/libstagefright/id3/
   - media/libstagefright/matroska/
   - media/libstagefright/mpeg2ts/
   - media/libstagefright/timedtext/
   - media/libstagefright/webm/

Bug: 30227045
Test: m -j40 and device builds and boots
Test: CFI is not enabled unless built with ENABLE_CFI=true
Test: CFI enabled build passes the media CTS tests.

Change-Id: I294b55ab34f94cca4eb9a2eef9c5c7f050d22b75
parent 3b7958fa

media/libstagefright/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,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
@@ -14,7 +14,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
@@ -28,4 +28,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