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 @@
 	stream_encoder.c \
 	stream_encoder_framing.c \
 	window.c
+
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/.. \
@@ -25,7 +26,6 @@
 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