commit 89f24546f131e78ada87d60c3843470fd737fa24
author Andreas Huber <andih@google.com> Wed May 09 01:47:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 01:47:43 2012 -0700
tree 837a9f94f85f7c3f28140a0023d824c5d23f0f1f
parent f4407649ea26382dd33109c71cc0c3b150f56f87
parent c150ca7dda844891fa684f6898da7f7e0c40329d

am c150ca7d: Merge "Submit codec specific data automatically" into jb-dev

* commit 'c150ca7dda844891fa684f6898da7f7e0c40329d':
  Submit codec specific data automatically

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)