commit 8ab086d0356f90bc1901d1c4e7e0687f6ac273c3
author Dave Burke <daveburke@google.com> Thu May 10 15:25:59 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 15:25:59 2012 -0700
tree a40e2e9ee0d320635a46615d46b81df4954bd5b3
parent 0bf474261dc5656990ecc25af63f3b2d125b2b20
parent da66e667840de77d3b9a9a094bbf12f43975d7e0

am da66e667: Merge "Make decoder more robust to inaccurate ASCs." into jb-dev

* commit 'da66e667840de77d3b9a9a094bbf12f43975d7e0':
  Make decoder more robust to inaccurate ASCs.

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)