diff options
| author | Tim Gore <tim.gore@intel.com> | 2014-06-03 15:18:31 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-03 16:37:53 +0200 |
| commit | 73c40324159b1fda9db3d8c34c47a722977d213d (patch) | |
| tree | 99b8ad90d1069fbbbbfa817f317e087e61402808 /tests/Android.mk | |
| parent | 0dc8794fc07faf8f2b008f98fd8ef6ed04300119 (diff) | |
intel-gpu-tools: remove testdisplay.h from kms_render.c
kms_render.c included testdisplay.h but did not need it.
This was preventing it from building on Android due to the
lack of a Glib port. So I have removed this #include and
changed Android.mk so that kms_render is built if we have
cairo.
Signed-off-by: Tim Gore <tim.gore@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/Android.mk')
| -rw-r--r-- | tests/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 6e9dc675..3fd32f51 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -31,7 +31,6 @@ skip_tests_list := skip_tests_list += gem_seqno_wrap skip_tests_list += testdisplay # needs glib.h skip_tests_list += pm_rpm -skip_tests_list += kms_render # needs glib.h # set local compilation flags for IGT tests IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG @@ -69,7 +68,8 @@ else gem_render_copy \ pm_lpsp \ kms_fence_pin_leak \ - kms_mmio_vs_cs_flip + kms_mmio_vs_cs_flip \ + kms_render IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endif |