commit 0857d4e2bdca4d4b0fd085b6fe7058d61b080165
author Andreas Huber <andih@google.com> Thu May 10 13:49:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 13:49:11 2012 -0700
tree a09142c2b73a5e594aaad71a085c053ee9a57e09
parent ce7380818e9b19668730fdc527ee7876d3427078
parent 5c36fc8701eb7468c268c47dae5dba58dbd8e83e

am 5c36fc87: Don\'t attempt to support content the software MPEG4 decoder clearly wasn\'t

* commit '5c36fc8701eb7468c268c47dae5dba58dbd8e83e':
  Don't attempt to support content the software MPEG4 decoder clearly wasn't

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)