diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-08 15:16:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-08 15:16:07 -0800 |
| commit | 7723c94d3295de4e9a2b14cbf9f3a9a999f201d2 (patch) | |
| tree | 8321d0b8dcf122727ac05e44187902e9466b1d07 /media | |
| parent | 67c12cc2aa5afd5922ceeaad91f951b99e2b2083 (diff) | |
| parent | 2c510140507bb19097688a58c3ac7eca3aa638c0 (diff) | |
| download | frameworks_base-7723c94d3295de4e9a2b14cbf9f3a9a999f201d2.zip frameworks_base-7723c94d3295de4e9a2b14cbf9f3a9a999f201d2.tar.gz frameworks_base-7723c94d3295de4e9a2b14cbf9f3a9a999f201d2.tar.bz2 | |
Merge "Use Tremor for sim-eng, and Tremolo for other targets."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 10 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 9 |
2 files changed, 17 insertions, 2 deletions
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 @@ ifneq ($(TARGET_SIMULATOR),true) 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) 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 @@ endif 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 \ |