commit b26105c04508f32528f59dd66b78d1e0858fe90e
author Andreas Huber <andih@google.com> Thu May 03 16:10:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 03 16:10:46 2012 -0700
tree 8a1176866631f295dae0b5bd11ca1929d3a61222
parent 878044b88a088ca021fdfa113150e7a2233a8f16
parent f53c36c6463d899895719b8b17ba45bd2d552cee

am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev

* commit 'f53c36c6463d899895719b8b17ba45bd2d552cee':
  Respect channel mask in ACodec and NuPlayer.

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)