commit 706bb450ee7eb56691c61b40284136d9e2228444
author James Dong <jdong@google.com> Mon May 07 15:09:23 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 07 15:09:23 2012 -0700
tree 8e5390b1020573a4965e40711b8b791ed4719a3c
parent 907a33bce9457a8b27de35c554856dc6d45b0d9b
parent 3e0f56df1a22b76f59d85699d0cc78c37ddd37c5

am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev

* commit '3e0f56df1a22b76f59d85699d0cc78c37ddd37c5':
  Get rid of vendor specific video encoder component names from ACodec and OMXCodec

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)