diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-10 13:04:09 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-10 13:04:09 -0700 |
| commit | b01cc9ce33f8ddc08e099aa70ad66ef177288c1d (patch) | |
| tree | 4745aa65123f156894318a23299996dae8dc54c4 | |
| parent | 0f9d9dadc97db305a9962e2e603c5fa700fdc48a (diff) | |
| download | hwcomposer-b01cc9ce33f8ddc08e099aa70ad66ef177288c1d.tar.gz | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: Idcf26a65cad5f6694118c68861e6d409ac187940
| -rw-r--r-- | merrifield/ips/common/RotationBufferProvider.cpp | 1 | ||||
| -rw-r--r-- | merrifield/platforms/merrifield/Android.mk | 3 | ||||
| -rw-r--r-- | merrifield/platforms/merrifield_plus/Android.mk | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/merrifield/ips/common/RotationBufferProvider.cpp b/merrifield/ips/common/RotationBufferProvider.cpp index 65a4db8..a0c0e62 100644 --- a/merrifield/ips/common/RotationBufferProvider.cpp +++ b/merrifield/ips/common/RotationBufferProvider.cpp @@ -16,6 +16,7 @@ #include <HwcTrace.h> #include <common/RotationBufferProvider.h> +#include <system/window.h> namespace android { namespace intel { diff --git a/merrifield/platforms/merrifield/Android.mk b/merrifield/platforms/merrifield/Android.mk index 9efd7fd..0908c53 100644 --- a/merrifield/platforms/merrifield/Android.mk +++ b/merrifield/platforms/merrifield/Android.mk @@ -21,8 +21,9 @@ include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ - libwsbm libutils libhardware \ + libwsbm libutils libhardware libnativewindow \ libva libva-tpi libva-android libsync + 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 dae5335..daa36b0 100644 --- a/merrifield/platforms/merrifield_plus/Android.mk +++ b/merrifield/platforms/merrifield_plus/Android.mk @@ -21,8 +21,9 @@ include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ - libwsbm libutils libhardware \ + libwsbm libutils libhardware libnativewindow \ libva libva-tpi libva-android libsync + LOCAL_SRC_FILES := \ ../../common/base/Drm.cpp \ ../../common/base/HwcLayer.cpp \ |