aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-02-05 15:18:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-05 15:18:45 -0800
commit6fa9c323b7d0a7f52d6e575d9d620efab7b1c6e9 (patch)
tree9edff820a0981084c96fb24e51eb8a746e1ea32b
parent428a4dcd33817bc7e0508cdf94cc35f451cc6ade (diff)
parent8a10af55f9b10ea77dc78fb221ebeda2204fb34e (diff)
downloadopencore-6fa9c323b7d0a7f52d6e575d9d620efab7b1c6e9.tar.gz
Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
-rw-r--r--android/Android.mk2
-rw-r--r--android/author/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/Android.mk b/android/Android.mk
index 39ae3e17f..d1f7831ba 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES := $(PV_INCLUDES) \
libs/drm/mobile1/include \
include/graphics \
external/skia/include/corecg \
- external/tremor/Tremor \
+ external/tremolo/Tremolo \
$(call include-path-for, graphics corecg)
LOCAL_MODULE := libandroidpv
diff --git a/android/author/Android.mk b/android/author/Android.mk
index f32d498cc..0d512b2ee 100644
--- a/android/author/Android.mk
+++ b/android/author/Android.mk
@@ -29,7 +29,7 @@ LOCAL_C_INCLUDES := $(PV_INCLUDES) \
$(PV_TOP)/nodes/pvmp4ffcomposernode/include \
$(PV_TOP)/engines/player/include \
$(PV_TOP)/nodes/common/include \
- external/tremor/Tremor \
+ external/tremolo/Tremolo \
libs/drm/mobile1/include \
$(call include-path-for, graphics corecg)