diff options
| author | Mathias Agopian <mathias@google.com> | 2017-04-28 15:48:34 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-05 14:08:40 -0700 |
| commit | d8108ab504572b9121c5eae6d4e3978ced838efd (patch) | |
| tree | f5b301f37bf0940cd4d6b4fbec4a0961545966ba /tests | |
| parent | 750b027b930f4ebd08d64ef06d37c75b1725d339 (diff) | |
fix circular dependency libnativewindow <-> libui
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I5aaf07dd76d0d8f5294fb4133c7a0b5e6df3bebc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hardware/struct-last.cpp | 1 | ||||
| -rw-r--r-- | tests/hardware/struct-offset.cpp | 1 | ||||
| -rw-r--r-- | tests/hardware/struct-size.cpp | 1 | ||||
| -rw-r--r-- | tests/hwc/Android.mk | 3 |
4 files changed, 2 insertions, 4 deletions
diff --git a/tests/hardware/struct-last.cpp b/tests/hardware/struct-last.cpp index 44a7b2d3..276d7867 100644 --- a/tests/hardware/struct-last.cpp +++ b/tests/hardware/struct-last.cpp @@ -15,7 +15,6 @@ */ #include <cstddef> -#include <system/window.h> #include <hardware/hardware.h> #include <hardware/sensors.h> #include <hardware/fb.h> diff --git a/tests/hardware/struct-offset.cpp b/tests/hardware/struct-offset.cpp index 7f7f2e0d..6f86f030 100644 --- a/tests/hardware/struct-offset.cpp +++ b/tests/hardware/struct-offset.cpp @@ -15,7 +15,6 @@ */ #include <cstddef> -#include <system/window.h> #include <hardware/hardware.h> #include <hardware/sensors.h> #include <hardware/fb.h> diff --git a/tests/hardware/struct-size.cpp b/tests/hardware/struct-size.cpp index acb9d2d6..232b55da 100644 --- a/tests/hardware/struct-size.cpp +++ b/tests/hardware/struct-size.cpp @@ -15,7 +15,6 @@ */ -#include <system/window.h> #include <hardware/hardware.h> #include <hardware/sensors.h> #include <hardware/fb.h> diff --git a/tests/hwc/Android.mk b/tests/hwc/Android.mk index 367f5f47..0416ff1c 100644 --- a/tests/hwc/Android.mk +++ b/tests/hwc/Android.mk @@ -4,12 +4,13 @@ include $(CLEAR_VARS) LOCAL_MODULE := libcnativewindow LOCAL_SRC_FILES := cnativewindow.c util.c LOCAL_CFLAGS := -Wno-unused-parameter +LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libdl libhardware libnativewindow include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := hwc-test-arrows LOCAL_SRC_FILES := test-arrows.c LOCAL_STATIC_LIBRARIES := libcnativewindow -LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libdl libhardware +LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libdl libhardware libnativewindow LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES include $(BUILD_EXECUTABLE) |