commit 38f45a53ff1a19d3a6440e03a579b23186267062
author Jean-Michel Trivi <jmtrivi@google.com> Wed May 02 11:08:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 11:08:15 2012 -0700
tree 089f769ad30a8fad59b9d24f27647dae757509ad
parent 375172c4ccb1b810e1065cf9dad98b8a9c4c5fc8
parent 95c157cc6b109a5058f29edd73811e90d91e92ab

am 95c157cc: Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev

* commit '95c157cc6b109a5058f29edd73811e90d91e92ab':
  Tolerate 0 valid bits value in WAV_EXT

media/libstagefright/codecs/common/Android.mk

diff --git a/media/libstagefright/codecs/common/Android.mk b/media/libstagefright/codecs/common/Android.mk
index af8795a..77fe934 100644
--- a/media/libstagefright/codecs/common/Android.mk
+++ b/media/libstagefright/codecs/common/Android.mk
@@ -16,17 +16,6 @@
 
 LOCAL_CFLAGS := $(VO_CFLAGS)
 
-ifeq ($(VOTT), v5)
-LOCAL_CFLAGS += -DARM -DASM_OPT
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E
-endif
-
-ifeq ($(VOTT), v7)
-LOCAL_CFLAGS += -DARM -DARMV7 -DASM_OPT
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7
-endif
-
 include $(BUILD_SHARED_LIBRARY)