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>
This commit is contained in:
Tim Gore 2014-06-03 15:18:31 +01:00 committed by Daniel Vetter
parent 0dc8794fc0
commit 73c4032415
2 changed files with 2 additions and 3 deletions

View File

@ -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

View File

@ -31,7 +31,6 @@
#include <sys/time.h>
#include "drmtest.h"
#include "testdisplay.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_io.h"