commit d57c4548766e112cd70c43773e296122eb489a50
author Marco Nelissen <marcone@google.com> Mon May 07 16:00:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 07 16:00:15 2012 -0700
tree 9a6fba03d04e0c32c96d3f075297e5e0e739ec33
parent 6dd12786534b9926d9834c08d09983fc535f946d
parent a62bde0a391f65a418d77c46e6ba468433d81dba

am a62bde0a: Merge "Use new sd card mount point for dumpsys" into jb-dev

* commit 'a62bde0a391f65a418d77c46e6ba468433d81dba':
  Use new sd card mount point for dumpsys

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)