commit a8f613283901dfbe4c06c9149930f4c923c15374
author James Dong <jdong@google.com> Wed May 02 11:36:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 02 11:36:15 2012 -0700
tree 4a66971cc5a7b43568ac53eb760f8a6e05fd84eb
parent ce0a54de16aa2197fe4e6ac9a8c91562ae0ff114
parent 359f90cea8a59c4a8d25b422fd0b0569e31db2fa

am 359f90ce: Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev

* commit '359f90cea8a59c4a8d25b422fd0b0569e31db2fa':
  The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.

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)