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

Commit 725c7852 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Turn off signed integer overflow checking for amrwbenc" into nyc-dev 

am: 596e81bc

* commit '596e81bc':
  Turn off signed integer overflow checking for amrwbenc

Change-Id: Ib7a179a9e16cebeb1af88682bd89a5857c480682
parents 0ac77416 596e81bc

media/libstagefright/codecs/amrwbenc/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ else 
        src/asm/ARMV7/Syn_filt_32_neon.s \

        src/asm/ARMV7/syn_filt_neon.s



    LOCAL_CFLAGS_arm := -DARM -DARMV7 -DASM_OPT

    # don't actually generate neon instructions, see bug 26932980

    LOCAL_CFLAGS_arm := -DARM -DARMV7 -DASM_OPT -mfpu=vfpv3

    LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/src/asm/ARMV5E

    LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/src/asm/ARMV7

endif
@@ -102,7 +103,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

LOCAL_SANITIZE := signed-integer-overflow

#LOCAL_SANITIZE := signed-integer-overflow



include $(BUILD_STATIC_LIBRARY)