Commit a702b607 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

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's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
parent d7d3f4e8
......@@ -22,6 +22,13 @@ if !HAVE_LIBDRM_INTEL
stubs/drm/intel_bufmgr.h
endif
if HAVE_CHAMELIUM
lib_source_list += \
igt_chamelium.h \
igt_chamelium.c \
$(NULL)
endif
AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = \
$(CWARNFLAGS) \
......
......@@ -85,13 +85,6 @@ lib_source_list = \
igt_kmod.h \
$(NULL)
if HAVE_CHAMELIUM
lib_source_list += \
igt_chamelium.h \
igt_chamelium.c \
$(NULL)
endif
.PHONY: version.h.tmp
# leaving a space here to work around automake's conditionals
......
......@@ -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"
......
......@@ -26,7 +26,10 @@
#ifndef IGT_CHAMELIUM_H
#define IGT_CHAMELIUM_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "igt.h"
#include <stdbool.h>
......
......@@ -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 > $@
......
......@@ -154,12 +154,6 @@ TESTS_progs_M = \
meta_test \
$(NULL)
if HAVE_CHAMELIUM
TESTS_progs_M += \
chamelium \
$(NULL)
endif
TESTS_progs_XM = \
gem_concurrent_all \
$(NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment