summaryrefslogtreecommitdiff
authorstark.li <stark.li@amlogic.com>2014-09-19 02:52:17 (GMT)
committer stark.li <stark.li@amlogic.com>2014-09-19 02:52:17 (GMT)
commita06ac2938c4663287988e5b841e9ba926465034d (patch)
treef84dd8197349e385f4b1a7bbc386c89845d2c8a3
parentd64aeb838498e47c6b09b8c6c6b014c421793f3b (diff)
downloadhwcomposer-a06ac2938c4663287988e5b841e9ba926465034d.zip
hwcomposer-a06ac2938c4663287988e5b841e9ba926465034d.tar.gz
hwcomposer-a06ac2938c4663287988e5b841e9ba926465034d.tar.bz2
merge from amlogic-pd-00001 and update hwc version to 1.3
Change-Id: I60ed1504a1cd60fbc4f4173dc9f6de5b2374b41f
Diffstat
-rwxr-xr-xAndroid.mk3
-rwxr-xr-xhwcomposer.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index e338ac3..71ad3b0 100755
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,9 @@ endif
LOCAL_C_INCLUDES += \
$(GRALLOC_DIR)
+LOCAL_C_INCLUDES += system/core/libion/include/ \
+ system/core/libion/kernel-headers
+
ifneq ($(WITH_LIBPLAYER_MODULE),false)
LOCAL_SHARED_LIBRARIES += libamavutils
AMPLAYER_APK_DIR=$(TOP)/packages/amlogic/LibPlayer/
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index 25e1c40..5dfb861 100755
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -960,7 +960,7 @@ static int hwc_device_open(const struct hw_module_t* module, const char* name,
dev->vsync_period = 16666666;
dev->base.common.tag = HARDWARE_DEVICE_TAG;
- dev->base.common.version = HWC_DEVICE_API_VERSION_1_1;
+ dev->base.common.version = HWC_DEVICE_API_VERSION_1_3;
dev->base.common.module = const_cast<hw_module_t *>(module);
dev->base.common.close = hwc_close;