commit 2c510140507bb19097688a58c3ac7eca3aa638c0
author Gloria Wang <gwang@google.com> Mon Feb 08 14:37:41 2010 -0800
committer Gloria Wang <gwang@google.com> Mon Feb 08 14:37:41 2010 -0800
tree 64324a939674ab7456bac010b8346119992d9e3e
parent 870d81d038391d1d3896e7f2fa44801d1667f5bf

Use Tremor for sim-eng, and Tremolo for other targets.

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index d51ab30..12872bc 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -54,12 +54,20 @@
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
-LOCAL_C_INCLUDES := external/tremor/Tremor                              \
+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)/external/tremolo/Tremolo
+else
+    LOCAL_C_INCLUDES += \
+        $(TOP)/external/tremor/Tremor
+endif
+
 LOCAL_MODULE:= libmediaplayerservice
 
 include $(BUILD_SHARED_LIBRARY)

media/libstagefright/Android.mk

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index b25ce67..58eb12e 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -48,8 +48,15 @@
 LOCAL_C_INCLUDES:= \
 	$(JNI_H_INCLUDE) \
         $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
-        $(TOP)/external/opencore/android \
+        $(TOP)/external/opencore/android
+
+ifeq ($(TARGET_ARCH),arm)
+    LOCAL_C_INCLUDES += \
+        $(TOP)/external/tremolo/Tremolo
+else
+    LOCAL_C_INCLUDES += \
         $(TOP)/external/tremor/Tremor
+endif
 
 LOCAL_SHARED_LIBRARIES := \
         libbinder         \