commit 7a0e268bc998d4bfbf0e9744921d1d7b73c93ac2
author James Dong <jdong@google.com> Wed May 16 01:14:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 16 01:14:14 2012 -0700
tree d1d8c0461783de6446519f8be8500bb2b1524b1e
parent 7d2256a535434d4f05a57eebc592790a1d1edd90
parent a86c809bff463ae1d782dcaa1c45d1acea5f34d3

am a86c809b: Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine

* commit 'a86c809bff463ae1d782dcaa1c45d1acea5f34d3':
  Remove libvideoeditor_jni.so's dependency on static libs in video editor engine

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)