summaryrefslogtreecommitdiffstats
path: root/libFLAC
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2013-05-17 18:16:30 -0700
committerChad Brubaker <cbrubaker@google.com>2013-05-20 18:44:19 -0700
commitab37b6247df0e8c4ec0ccaa870e667f62c74975b (patch)
treef45a6ad69ac9664f0d6598a06a4f20b19e48bdfc /libFLAC
parente4ad9757d5c98dea026da1697466293ac96268be (diff)
downloadandroid_external_flac-ab37b6247df0e8c4ec0ccaa870e667f62c74975b.tar.gz
android_external_flac-ab37b6247df0e8c4ec0ccaa870e667f62c74975b.tar.bz2
android_external_flac-ab37b6247df0e8c4ec0ccaa870e667f62c74975b.zip
Add signed integer overflow checking to flac.
Migrate flac over to Clang in order to use its -ftrapv option to abort on signed overflow. Change-Id: I9f92459b6b5ecfdc49377a191db8d0265f190ab1
Diffstat (limited to 'libFLAC')
-rw-r--r--libFLAC/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 2adb498..130bf68 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-
+LOCAL_CLANG := true
LOCAL_SRC_FILES:= \
bitmath.c \
bitreader.c \
@@ -17,7 +17,6 @@ LOCAL_SRC_FILES:= \
stream_encoder.c \
stream_encoder_framing.c \
window.c
-
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/.. \
@@ -26,6 +25,7 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC
LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions
+LOCAL_CFLAGS += -ftrapv
LOCAL_LDLIBS += -lm