commit 0bf474261dc5656990ecc25af63f3b2d125b2b20
author Andreas Huber <andih@google.com> Thu May 10 14:41:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 14:41:45 2012 -0700
tree 8a0c14f1bf8c3f312fad6ee54263dd4bedd9fc38
parent ddebe415450d1fba7a9cb1972f279621d6784c32
parent af9e6a17d7038b411b61a3cb0669694058511a05

am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev

* commit 'af9e6a17d7038b411b61a3cb0669694058511a05':
  Properly connect/disconnect to/from the native window in MediaCodec.

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)