commit 7d2256a535434d4f05a57eebc592790a1d1edd90
author Dave Burke <daveburke@google.com> Tue May 15 20:30:06 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 15 20:30:06 2012 -0700
tree e3051006527660398c43b1c6eb00c8a39850cf9b
parent e9f4e016145f9bd1f2d133425dde6440d2f4c27e
parent 62999949c58ae18784a6061d83e4f2b78dbc3465

am 62999949: Merge "Add logging for invalid channel count or sample rate." into jb-dev

* commit '62999949c58ae18784a6061d83e4f2b78dbc3465':
  Add logging for invalid channel count or sample rate.

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)