commit 0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4
author Andreas Huber <andih@google.com> Thu May 10 15:25:59 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 15:25:59 2012 -0700
tree 92a1ecd68b6b926fac8bbf4c91dfccd2ff697603
parent 8ab086d0356f90bc1901d1c4e7e0687f6ac273c3
parent 96409203b4a857768e38137e88001378ad383584

am 96409203: Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev

* commit '96409203b4a857768e38137e88001378ad383584':
  Add "support" for AMR WB comfort noise, no data and speech lost frame types

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)