summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Android.mk
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-02-12 16:28:53 -0800
committerGloria Wang <gwang@google.com>2010-02-12 16:46:40 -0800
commitb56e992476d1bbeb4021d256852dbe02fc1064f8 (patch)
treed5b87b82f4214e7d15e1ab9585724a62f33b75d5 /media/libmediaplayerservice/Android.mk
parent328901bdc7c00ab361c5ef16d0d69c94a0458e95 (diff)
downloadframeworks_av-b56e992476d1bbeb4021d256852dbe02fc1064f8.zip
frameworks_av-b56e992476d1bbeb4021d256852dbe02fc1064f8.tar.gz
frameworks_av-b56e992476d1bbeb4021d256852dbe02fc1064f8.tar.bz2
Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
-rw-r--r--media/libmediaplayerservice/Android.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index a9a0fde..cf97b23 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -59,15 +59,8 @@ LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
- $(TOP)/frameworks/base/media/libstagefright/include
-
-ifeq ($(TARGET_ARCH),arm)
- LOCAL_C_INCLUDES += \
+ $(TOP)/frameworks/base/media/libstagefright/include \
$(TOP)/external/tremolo/Tremolo
-else
- LOCAL_C_INCLUDES += \
- $(TOP)/external/tremor/Tremor
-endif
LOCAL_MODULE:= libmediaplayerservice