commit ddebe415450d1fba7a9cb1972f279621d6784c32
author Glenn Kasten <gkasten@google.com> Thu May 10 14:22:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 14:22:17 2012 -0700
tree 831783cb4016869be02189390b607da211fe5041
parent 0857d4e2bdca4d4b0fd085b6fe7058d61b080165
parent c3798d7e97cb11076310f06163417c0631cce04e

am c3798d7e: Merge "Update fast mixer statistics" into jb-dev

* commit 'c3798d7e97cb11076310f06163417c0631cce04e':
  Update fast mixer statistics

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)