diff options
author | Gloria Wang <gwang@google.com> | 2010-02-08 14:37:41 -0800 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-02-08 14:37:41 -0800 |
commit | 9636054b52f0de54e42b669805883c71a5196d42 (patch) | |
tree | ed4a018a19d34a4bf3ac20f6ffbd1aeb8003d735 /media/libmediaplayerservice | |
parent | c9c4bef6b7f6793263a1f7659fe3641e856f2573 (diff) | |
download | frameworks_av-9636054b52f0de54e42b669805883c71a5196d42.zip frameworks_av-9636054b52f0de54e42b669805883c71a5196d42.tar.gz frameworks_av-9636054b52f0de54e42b669805883c71a5196d42.tar.bz2 |
Use Tremor for sim-eng, and Tremolo for other targets.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/Android.mk | 10 |
1 files changed, 9 insertions, 1 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) |