summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2013-11-25 17:36:47 -0800
committerGlenn Kasten <gkasten@android.com>2013-11-25 17:36:47 -0800
commite141613849b5f055961c5ec9d6453e5ab7560910 (patch)
treeea130c92bcf0adebaf529e173e3af7328bc4519d
parentab37b6247df0e8c4ec0ccaa870e667f62c74975b (diff)
downloadandroid_external_flac-e141613849b5f055961c5ec9d6453e5ab7560910.tar.gz
android_external_flac-e141613849b5f055961c5ec9d6453e5ab7560910.tar.bz2
android_external_flac-e141613849b5f055961c5ec9d6453e5ab7560910.zip
Revert "Add signed integer overflow checking to flac."
This reverts commit ab37b6247df0e8c4ec0ccaa870e667f62c74975b. Bug: 11458679 Change-Id: Ic0fc3c42f7a030cd213853b865f7d1dcfedac868
-rw-r--r--libFLAC/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 130bf68..2adb498 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,6 +17,7 @@ LOCAL_SRC_FILES:= \
stream_encoder.c \
stream_encoder_framing.c \
window.c
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/.. \
@@ -25,7 +26,6 @@ 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