From 8d00b53cc408a7fce541fa076a55c9b7239ce590 Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Fri, 12 Feb 2010 16:28:53 -0800 Subject: [PATCH] Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression) --- media/libmediaplayerservice/Android.mk | 9 +-------- media/libstagefright/Android.mk | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index a9a0fde61b71a..cf97b2344ebaf 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -59,15 +59,8 @@ LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ - $(TOP)/frameworks/base/media/libstagefright/include - -ifeq ($(TARGET_ARCH),arm) - LOCAL_C_INCLUDES += \ + $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/external/tremolo/Tremolo -else - LOCAL_C_INCLUDES += \ - $(TOP)/external/tremor/Tremor -endif LOCAL_MODULE:= libmediaplayerservice diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 1db398ee83d61..071bb9ecd8fbe 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -48,15 +48,8 @@ endif LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ - $(TOP)/external/opencore/android - -ifeq ($(TARGET_ARCH),arm) - LOCAL_C_INCLUDES += \ + $(TOP)/external/opencore/android \ $(TOP)/external/tremolo/Tremolo -else - LOCAL_C_INCLUDES += \ - $(TOP)/external/tremor/Tremor -endif LOCAL_SHARED_LIBRARIES := \ libbinder \