commit b56e992476d1bbeb4021d256852dbe02fc1064f8
author Gloria Wang <gwang@google.com> Fri Feb 12 16:28:53 2010 -0800
committer Gloria Wang <gwang@google.com> Fri Feb 12 16:46:40 2010 -0800
tree d5b87b82f4214e7d15e1ab9585724a62f33b75d5
parent 328901bdc7c00ab361c5ef16d0d69c94a0458e95

Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index a9a0fde..cf97b23 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -59,15 +59,8 @@
 	$(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
 

media/libstagefright/Android.mk

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 1db398e..071bb9e 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -48,15 +48,8 @@
 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         \