summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-01 16:04:18 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-01 16:04:18 +0000
commit408d0000fbb36215bff2461517f4faaa37686b2f (patch)
treef45a6ad69ac9664f0d6598a06a4f20b19e48bdfc
parent4c66aeb14846e2e43e457eb199386bf4ee69a8ed (diff)
parentab37b6247df0e8c4ec0ccaa870e667f62c74975b (diff)
downloadandroid_external_flac-408d0000fbb36215bff2461517f4faaa37686b2f.tar.gz
android_external_flac-408d0000fbb36215bff2461517f4faaa37686b2f.tar.bz2
android_external_flac-408d0000fbb36215bff2461517f4faaa37686b2f.zip
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
-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