commit e9f4e016145f9bd1f2d133425dde6440d2f4c27e
author James Dong <jdong@google.com> Tue May 15 17:28:31 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 15 17:28:31 2012 -0700
tree a5843e6189379fa7d4e072d3e08fdda0271fd39c
parent 792f3b2e9ef31876567a1e28ab5d2d9af514e4a0
parent 50a9908f987fd5a73d8a95d6fe46b530386cdc86

am 50a9908f: Merge "Speed up stsz box write in MPEG4Writer" into jb-dev

* commit '50a9908f987fd5a73d8a95d6fe46b530386cdc86':
  Speed up stsz box write in MPEG4Writer

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)