diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-05 18:50:17 -0800 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-02-05 18:50:17 -0800 |
| commit | 7ebf475799f6ae1ec8c67983fc1028c487af4c2e (patch) | |
| tree | 3d271050eac1a41b84ba265e0b31401317ccdbdc /media | |
| parent | 5dd69302ffabd260d035fe309374892c7d681926 (diff) | |
| download | frameworks_av-7ebf475799f6ae1ec8c67983fc1028c487af4c2e.zip frameworks_av-7ebf475799f6ae1ec8c67983fc1028c487af4c2e.tar.gz frameworks_av-7ebf475799f6ae1ec8c67983fc1028c487af4c2e.tar.bz2 | |
Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
This reverts commit 2f46c062b05254671aec96a98b431f91ae7b270c.
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 b4c7212..d51ab30 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/tremolo/Tremolo \ +LOCAL_C_INCLUDES := external/tremor/Tremor \ $(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 6b880e8..b25ce67 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/tremolo/Tremolo + $(TOP)/external/tremor/Tremor LOCAL_SHARED_LIBRARIES := \ libbinder \ |