diff options
| author | 2010-02-05 19:06:38 -0800 | |
|---|---|---|
| committer | 2010-02-05 19:06:38 -0800 | |
| commit | 6b31e4d21f809bfb440034364aac8db4aa0cfcea (patch) | |
| tree | 47b08b193261e661a1d93a351f9085b3b13f9d45 | |
| parent | 496388cbdbd58dc7f12ce6a5eb8f48b298a21fd7 (diff) | |
| parent | 96827283dfb58dbe39bc241598177ed164e2dc0a (diff) | |
Merge "Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)""
| -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 b4c72123c698..d51ab3034f81 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 6b880e866653..b25ce67ee5b7 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 \ |