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

Commit 167dffbf authored by Dan Austin's avatar Dan Austin Committed by Gerrit Code Review
Browse files

Merge changes I6eb5d2c6,Iae2103c4 

* changes:
  Enable fsanitize signed-integer-overflow in AMR-NB decoder
  Enable fsanitize signed-integer-overflow in AMR-NB encoder
parents 6a869df9 a49c705c

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

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ LOCAL_CFLAGS := \ 
        -D"OSCL_UNUSED_ARG(x)=(void)(x)" -DOSCL_IMPORT_REF=



LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_MODULE := libstagefright_amrnbdec
@@ -71,6 +73,8 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS := -DOSCL_IMPORT_REF=



LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_STATIC_LIBRARIES := \

        libstagefright_amrnbdec libstagefright_amrwbdec
@@ -100,6 +104,9 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES := \

        libstagefright_amrnb_common libaudioutils



LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_MODULE := libstagefright_amrnbdec_test

LOCAL_MODULE_TAGS := optional

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

+7 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ LOCAL_CFLAGS := \ 
        -D"OSCL_UNUSED_ARG(x)=(void)(x)"



LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_MODULE := libstagefright_amrnbenc
@@ -91,6 +93,8 @@ LOCAL_C_INCLUDES := \ 
        $(LOCAL_PATH)/../common



LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_STATIC_LIBRARIES := \

        libstagefright_amrnbenc
@@ -121,6 +125,9 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES := \

    libstagefright_amrnb_common



LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_MODULE := libstagefright_amrnbenc_test

LOCAL_MODULE_TAGS := tests