From 96827283dfb58dbe39bc241598177ed164e2dc0a Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Fri, 5 Feb 2010 18:50:17 -0800 Subject: [PATCH] Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)" This reverts commit 2f46c062b05254671aec96a98b431f91ae7b270c. --- media/libmediaplayerservice/Android.mk | 2 +- 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 b4c72123c698d..d51ab3034f816 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 6b880e8666534..b25ce67ee5b78 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 \