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

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

Merge "Enable CFI for some media components."

parents 5867438f a4a6d63e

media/libmedia/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ 
    frameworks/av/media/libmedia/aidl



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

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

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

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codec2/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ LOCAL_C_INCLUDES += \ 
LOCAL_MODULE:= libstagefright_codec2

LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true

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

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

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/aacdec/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS :=



LOCAL_CFLAGS += -Werror

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

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

LOCAL_SANITIZE_DIAG := cfi



LOCAL_STATIC_LIBRARIES := libFraunhoferAAC

media/libstagefright/codecs/aacenc/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ ifeq ($(AAC_LIBRARY), fraunhofer) 
  LOCAL_CFLAGS :=



  LOCAL_CFLAGS += -Werror

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

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

  LOCAL_SANITIZE_DIAG := cfi



  LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
@@ -130,7 +131,8 @@ else # visualon 
  LOCAL_CFLAGS := -DOSCL_IMPORT_REF=



  LOCAL_CFLAGS += -Werror

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

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

  LOCAL_SANITIZE_DIAG := cfi



  LOCAL_STATIC_LIBRARIES := \

          libstagefright_aacenc

media/libstagefright/codecs/amrwbenc/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ LOCAL_C_INCLUDES := \ 
	frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Werror

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_STATIC_LIBRARIES := \

        libstagefright_amrwbenc