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

aosp-mirror · Feb 8, 2010 · ee9fc34 · ee9fc34
1 parent 97fd596
commit ee9fc34
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/android/Android.mk b/android/Android.mk
@@ -26,9 +26,16 @@ LOCAL_C_INCLUDES := $(PV_INCLUDES) \
     libs/drm/mobile1/include \
     include/graphics \
     external/skia/include/corecg \
-    external/tremor/Tremor \
     $(call include-path-for, graphics corecg)
 
+ifeq ($(TARGET_ARCH),arm)
+    LOCAL_C_INCLUDES += \
+        external/tremolo/Tremolo
+else
+    LOCAL_C_INCLUDES += \
+        external/tremor/Tremor
+endif
+
 LOCAL_MODULE := libandroidpv
 
 LOCAL_SHARED_LIBRARIES := libui libutils libbinder

diff --git a/android/author/Android.mk b/android/author/Android.mk
@@ -29,10 +29,17 @@ LOCAL_C_INCLUDES := $(PV_INCLUDES) \
     $(PV_TOP)/nodes/pvmp4ffcomposernode/include \
     $(PV_TOP)/engines/player/include \
     $(PV_TOP)/nodes/common/include \
-    external/tremor/Tremor \
     libs/drm/mobile1/include \
     $(call include-path-for, graphics corecg)
 
+ifeq ($(TARGET_ARCH),arm)
+    LOCAL_C_INCLUDES += \
+        external/tremolo/Tremolo
+else
+    LOCAL_C_INCLUDES += \
+        external/tremor/Tremor
+endif
+
 LOCAL_SHARED_LIBRARIES := libmedia libbinder
 
 LOCAL_MODULE := libandroidpvauthor