diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-10 15:22:25 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-10 15:22:25 -0700 |
| commit | 8e97af1f13ecb2c76cdbce2bb6e4bf36f7e8a905 (patch) | |
| tree | 22b2864acc2c281e8fd058fa6330f93095243217 | |
| parent | b01cc9ce33f8ddc08e099aa70ad66ef177288c1d (diff) | |
| download | hwcomposer-8e97af1f13ecb2c76cdbce2bb6e4bf36f7e8a905.tar.gz | |
fix circular dependency libnativewindow <-> libuioreo-mr1-devoreo-dr1-dev
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I7e5f416f25852b59531dad929e93881533ddf5d8
| -rw-r--r-- | merrifield/ips/common/RotationBufferProvider.cpp | 2 | ||||
| -rw-r--r-- | merrifield/platforms/merrifield/Android.mk | 4 | ||||
| -rw-r--r-- | merrifield/platforms/merrifield_plus/Android.mk | 4 | ||||
| -rw-r--r-- | moorefield_hdmi/Android.mk | 2 | ||||
| -rw-r--r-- | moorefield_hdmi/ips/common/RotationBufferProvider.cpp | 1 |
5 files changed, 10 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 \ diff --git a/moorefield_hdmi/Android.mk b/moorefield_hdmi/Android.mk index 8903585..0eb4900 100644 --- a/moorefield_hdmi/Android.mk +++ b/moorefield_hdmi/Android.mk @@ -32,6 +32,8 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ 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/moorefield_hdmi/ips/common/RotationBufferProvider.cpp b/moorefield_hdmi/ips/common/RotationBufferProvider.cpp index 3c23b6b..cc893d0 100644 --- a/moorefield_hdmi/ips/common/RotationBufferProvider.cpp +++ b/moorefield_hdmi/ips/common/RotationBufferProvider.cpp @@ -16,6 +16,7 @@ #include <common/utils/HwcTrace.h> #include <ips/common/RotationBufferProvider.h> +#include <system/graphics-base.h> namespace android { namespace intel { |