commit e5121e9da8298021cf245ead2145ba5eb3fb6077
author Glenn Kasten <gkasten@google.com> Thu May 03 10:34:53 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 03 10:34:53 2012 -0700
tree 613098cfe4235aae9950fed7bbdb45455c04bf24
parent 588f93d3130774056a8c568e31adeac29eb84579
parent 093000f7d11839b920e8dfaa42ed1d09f48e24b8

am 093000f7: Don\'t allow AudioTrack frameCount to decrease

* commit '093000f7d11839b920e8dfaa42ed1d09f48e24b8':
  Don't allow AudioTrack frameCount to decrease

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)