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 --- lib/igt.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/igt.h') diff --git a/lib/igt.h b/lib/igt.h index a97923ec..a069deb3 100644 --- a/lib/igt.h +++ b/lib/igt.h @@ -38,7 +38,9 @@ #include "igt_kms.h" #include "igt_pm.h" #include "igt_stats.h" +#ifdef HAVE_CHAMELIUM #include "igt_chamelium.h" +#endif #include "instdone.h" #include "intel_batchbuffer.h" #include "intel_chipset.h" -- cgit v1.2.3