commit 8954fb1f92d25be2b0f111f5d83a1ef311b8d579
author The Android Open Source Project <initial-contribution@android.com> Wed May 16 08:40:43 2012 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed May 16 08:40:43 2012 -0700
tree d1d8c0461783de6446519f8be8500bb2b1524b1e
parent 7a0e268bc998d4bfbf0e9744921d1d7b73c93ac2
parent 38e15fbd2bf9dd0dda2f049c7c1a2ce21e2724bd
parent 97b9e7d4fd5c34f762273d2cc9806d0f6294da15

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ieda43a5a0f94cd68ed2a7f8ed58ae2a36740fce8

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)