commit 8a6dbce54b814b453eb8ff4d86257c5770918f7e
author Glenn Kasten <gkasten@google.com> Wed May 02 11:08:23 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 11:08:23 2012 -0700
tree ff617d463fdfb8d2d63e2b5920fbc7e2df510d31
parent 38f45a53ff1a19d3a6440e03a579b23186267062
parent 428a59d9f6deb548f46151e7c7962aa204f13cf0

am 428a59d9: Merge "Fix race in AudioTrack destruction" into jb-dev

* commit '428a59d9f6deb548f46151e7c7962aa204f13cf0':
  Fix race in AudioTrack destruction

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)