From a702b60782d713ebce9199b0007d8beb083e49fe Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 12 Apr 2017 12:33:12 +0200 Subject: chamelium: Fix build issues on Android Makefile.sources are included 1:1 in Android.mk files, and are not parsed by automake. And yet those had some automake conditional logic. Moving it to .am file is enough for now. Also igt_chamelium.h included config.h without proper "HAVE_CONFIG_H" guard, and the file itself was included unconditionally. Signed-off-by: Arkadiusz Hiler Reviewed-by: Michal Wajdeczko --- tests/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 05681d50..61c7a153 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,6 +12,12 @@ if HAVE_LIBDRM_VC4 TESTS_progs_M += $(VC4_TESTS_M) endif +if HAVE_CHAMELIUM +TESTS_progs_M += \ + chamelium \ + $(NULL) +endif + if BUILD_TESTS test-list.txt: Makefile.sources @echo TESTLIST > $@ -- cgit v1.2.3