commit f4407649ea26382dd33109c71cc0c3b150f56f87
author Andreas Huber <andih@google.com> Wed May 09 01:47:07 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 01:47:07 2012 -0700
tree ea5ee2b7d5282a385f8471887c4ceb2666e96957
parent 70dbe3e9c240e6ae1a23edc4dc7ee8b6261667c5
parent a9623e018737889d32f6b231f913a70d020c7ac5

am a9623e01: Merge "Fix both H.263 and MPEG4 decoders." into jb-dev

* commit 'a9623e018737889d32f6b231f913a70d020c7ac5':
  Fix both H.263 and MPEG4 decoders.

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)