summaryrefslogtreecommitdiff
path: root/merrifield
diff options
context:
space:
mode:
Diffstat (limited to 'merrifield')
-rw-r--r--merrifield/ips/common/RotationBufferProvider.cpp2
-rw-r--r--merrifield/platforms/merrifield/Android.mk4
-rw-r--r--merrifield/platforms/merrifield_plus/Android.mk4
3 files changed, 7 insertions, 3 deletions
diff --git a/merrifield/ips/common/RotationBufferProvider.cpp b/merrifield/ips/common/RotationBufferProvider.cpp
index a0c0e62..5f90865 100644
--- a/merrifield/ips/common/RotationBufferProvider.cpp
+++ b/merrifield/ips/common/RotationBufferProvider.cpp
@@ -16,7 +16,7 @@
#include <HwcTrace.h>
#include <common/RotationBufferProvider.h>
-#include <system/window.h>
+#include <system/graphics-base.h>
namespace android {
namespace intel {
diff --git a/merrifield/platforms/merrifield/Android.mk b/merrifield/platforms/merrifield/Android.mk
index 0908c53..e6eb591 100644
--- a/merrifield/platforms/merrifield/Android.mk
+++ b/merrifield/platforms/merrifield/Android.mk
@@ -21,9 +21,11 @@ include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \
- libwsbm libutils libhardware libnativewindow \
+ libwsbm libutils libhardware \
libva libva-tpi libva-android libsync
+LOCAL_HEADER_LIBRARIES := libsystem_headers
+
LOCAL_SRC_FILES := \
../../common/base/Drm.cpp \
../../common/base/HwcLayer.cpp \
diff --git a/merrifield/platforms/merrifield_plus/Android.mk b/merrifield/platforms/merrifield_plus/Android.mk
index daa36b0..a0c9893 100644
--- a/merrifield/platforms/merrifield_plus/Android.mk
+++ b/merrifield/platforms/merrifield_plus/Android.mk
@@ -21,9 +21,11 @@ include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \
- libwsbm libutils libhardware libnativewindow \
+ libwsbm libutils libhardware \
libva libva-tpi libva-android libsync
+LOCAL_HEADER_LIBRARIES := libsystem_headers
+
LOCAL_SRC_FILES := \
../../common/base/Drm.cpp \
../../common/base/HwcLayer.cpp \