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

Commit 4ca485f7 authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Enable CFI for static media codec libraries. 

This CL enables CFI for the following components:
  - media/libstagefright/codecs/aacenc/
  - media/libstagefright/codecs/m4v_h263/dec/
  - media/libstagefright/codecs/m4v_h263/enc/
  - media/libstagefright/codecs/mp3dec/
  - media/libmediaplayerservice/nuplayer/
  - media/libstagefright/rtsp/

In most cases, these changes enable CFI for static libraries that are
included in CFI enabled components.

Bug: 30227045
Test: ENABLE_CFI=true m -j40
Test: Media CTS tests pass.
Change-Id: I976f5e5629a2c083dd24919ffe33a82967915ecd
(cherry picked from commit 040dc275)
parent 6d97f716

media/libmediaplayerservice/nuplayer/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -44,5 +44,7 @@ LOCAL_MODULE:= libstagefright_nuplayer 


LOCAL_MODULE_TAGS := eng



include $(BUILD_STATIC_LIBRARY)

LOCAL_SANITIZE := cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/aacenc/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ else # visualon 
  LOCAL_CFLAGS := -DOSCL_IMPORT_REF=



  LOCAL_CFLAGS += -Werror

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

  LOCAL_SANITIZE_DIAG := cfi

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



  LOCAL_STATIC_LIBRARIES := \

          libstagefright_aacenc

media/libstagefright/codecs/m4v_h263/dec/Android.mk

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



LOCAL_CFLAGS += -Werror

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/m4v_h263/enc/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Werror

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_STATIC_LIBRARY)
@@ -88,7 +89,8 @@ LOCAL_C_INCLUDES := \ 
        $(LOCAL_PATH)/include



LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= -DBX_RC

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_STATIC_LIBRARIES := \

        libstagefright_m4vh263enc

media/libstagefright/codecs/mp3dec/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ LOCAL_CFLAGS := \ 
        -D"OSCL_UNUSED_ARG(x)=(void)(x)"



LOCAL_CFLAGS += -Werror

LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_MODULE := libstagefright_mp3dec
@@ -102,7 +103,9 @@ LOCAL_C_INCLUDES := \ 
        $(LOCAL_PATH)/test/include \

        $(call include-path-for, audio-utils)



LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow cfi

LOCAL_SANITIZE_DIAG := cfi



LOCAL_STATIC_LIBRARIES := \

        libstagefright_mp3dec libsndfile