diff options
| author | Gloria Wang <gwang@google.com> | 2010-02-08 14:40:00 -0800 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-02-08 14:40:00 -0800 |
| commit | ee9fc344d12e5e1164e29e93e2e8bf244ce0272f (patch) | |
| tree | 2a3fb565746c9dbc7fad575cea78d3e9e7271fb4 | |
| parent | 97fd596193601f86d117bcf96db645b26b440f19 (diff) | |
| download | opencore-ee9fc344d12e5e1164e29e93e2e8bf244ce0272f.tar.gz | |
Use Tremor for sim-eng, and Tremolo for other targets.
| -rw-r--r-- | android/Android.mk | 9 | ||||
| -rw-r--r-- | android/author/Android.mk | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/android/Android.mk b/android/Android.mk index 39ae3e17f..f5d6bcda9 100644 --- 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 index f32d498cc..7a57da806 100644 --- 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 |