summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Android.mk
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-02-05 15:18:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-05 15:18:37 -0800
commit5dd69302ffabd260d035fe309374892c7d681926 (patch)
tree0d097c4d3d7b050fa1bfb1927289bc0631f3707b /media/libmediaplayerservice/Android.mk
parentffd4da72e0433a4142f605b626fc7ff6db7a2af8 (diff)
parent9944aaea3a4f0e7a68b448e666b025b458ecc595 (diff)
downloadframeworks_av-5dd69302ffabd260d035fe309374892c7d681926.zip
frameworks_av-5dd69302ffabd260d035fe309374892c7d681926.tar.gz
frameworks_av-5dd69302ffabd260d035fe309374892c7d681926.tar.bz2
Merge "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.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index d51ab30..b4c7212 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -54,7 +54,7 @@ ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += libdl
endif
-LOCAL_C_INCLUDES := external/tremor/Tremor \
+LOCAL_C_INCLUDES := external/tremolo/Tremolo \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \