diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-05 15:18:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-05 15:18:37 -0800 |
| commit | 75ed81427dce09fb3091f80585d3615f0efaf815 (patch) | |
| tree | 10d5c0642650647486345071779d2533b8d58988 /media | |
| parent | c5d1c6db61f208b206b260f897bb5bbc64be4d97 (diff) | |
| parent | 2f46c062b05254671aec96a98b431f91ae7b270c (diff) | |
| download | frameworks_base-75ed81427dce09fb3091f80585d3615f0efaf815.zip frameworks_base-75ed81427dce09fb3091f80585d3615f0efaf815.tar.gz frameworks_base-75ed81427dce09fb3091f80585d3615f0efaf815.tar.bz2 | |
Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 2 |
2 files changed, 2 insertions, 2 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 \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index b25ce67..6b880e8 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -49,7 +49,7 @@ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ $(TOP)/external/opencore/android \ - $(TOP)/external/tremor/Tremor + $(TOP)/external/tremolo/Tremolo LOCAL_SHARED_LIBRARIES := \ libbinder \ |