diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-10 17:58:24 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-10 17:58:24 -0700 |
| commit | 8a6bf7a07d49e7f3b6214a899209103c233589e9 (patch) | |
| tree | 191e1d4396de7d8f82913293bd6deb4a06f8b556 | |
| parent | 092dbc02099a2e19be850a81a6bf8f5d22d725bb (diff) | |
| download | psb_video-8a6bf7a07d49e7f3b6214a899209103c233589e9.tar.gz | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I5e7e599245c388f15a33615ca99f75ce0e462517
| -rw-r--r-- | src/Android.mk | 5 | ||||
| -rw-r--r-- | src/pnw_rotate.h | 1 | ||||
| -rwxr-xr-x | src/psb_drv_video.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/Android.mk b/src/Android.mk index 8ec21ab..0115c04 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -54,7 +54,10 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/hwdefs LOCAL_SHARED_LIBRARIES += libdl libdrm libwsbm libcutils \ - libutils libbinder libhardware liblog libsync + libutils libbinder libhardware liblog libsync libnativewindow + +LOCAL_HEADER_LIBRARIES := \ + libsystem_headers LOCAL_SRC_FILES := \ object_heap.c \ diff --git a/src/pnw_rotate.h b/src/pnw_rotate.h index 1cfd527..746d098 100644 --- a/src/pnw_rotate.h +++ b/src/pnw_rotate.h @@ -28,6 +28,7 @@ */ #include "psb_surface.h" #ifdef ANDROID +#include <system/graphics-base.h> static uint32_t VAROTATION2HAL(int va_rotate) { switch (va_rotate) { case VA_ROTATION_90: diff --git a/src/psb_drv_video.h b/src/psb_drv_video.h index 6df3424..73bfcda 100755 --- a/src/psb_drv_video.h +++ b/src/psb_drv_video.h @@ -62,7 +62,6 @@ #define XID unsigned int #define INT16 unsigned int #include <cutils/log.h> -#include <system/window.h> #undef LOG_TAG #define LOG_TAG "pvr_drv_video" #endif |