diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 6a5cb59..7b47bc9 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,4 +1,4 @@
-CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -floop-block -funsafe-loop-optimizations -finline-limit=1024
+CFLAGS_OPT :=  -O3 -fomit-frame-pointer -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -floop-block -funsafe-loop-optimizations -finline-limit=1024
 CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS
 CFLAGS_OPT_ARMv5 :=-march=armv6 -mfpu=vfp -marm -pipe
 CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS
diff --git a/android/jni/bs_config.mk b/android/jni/bs_config.mk
index ffb8f8b..32efe09 100644
--- a/android/jni/bs_config.mk
+++ b/android/jni/bs_config.mk
@@ -20,3 +20,8 @@ ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS += $(CFLAGS_OPT_X86)
 endif
 
+ifeq ($(NDK_DEBUG),1)
+LOCAL_CFLAGS += -ggdb -DDEBUG
+else
+LOCAL_CFLAGS += -DNDEBUG
+endif