From 62e1cbc6343577e4fe2ea5b93981fab015872670 Mon Sep 17 00:00:00 2001 From: Oscar Mateo Date: Fri, 13 Dec 2013 20:48:24 +0000 Subject: [PATCH] build: Create version and config information files in Android Also, skip the compilation of pm_lpsp in Android (uses Cairo) Signed-off-by: Oscar Mateo Signed-off-by: Daniel Vetter --- tests/Android.mk | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index c96f30a..c65f94c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -23,6 +23,33 @@ skip_lib_list := \ lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES)) LIB_SOURCES := $(addprefix lib/,$(lib_list)) +.PHONY: version.h.tmp + +$(LOCAL_PATH)/version.h.tmp: + @touch $@ + @if test -d .git; then \ + if which git > /dev/null; then git log -n 1 --oneline | \ + sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \ + >> $@ ; \ + fi \ + else \ + echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \ + fi + +$(LOCAL_PATH)/version.h: $(LOCAL_PATH)/version.h.tmp + @echo "updating version.h" + @if ! cmp -s $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h; then \ + mv $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h ; \ + else \ + rm $(LOCAL_PATH)/version.h.tmp ; \ + fi + +# FIXME: autogenerate this info # +$(LOCAL_PATH)/config.h: + @echo "updating config.h" + echo '#define PACKAGE_VERSION "1.5"' >> $@ ; \ + echo '#define TARGET_CPU_PLATFORM "android-ia"' >> $@ ; + #================# define add_test @@ -31,7 +58,10 @@ define add_test LOCAL_SRC_FILES := \ tests/$1.c \ $(LIB_SOURCES) - + + LOCAL_GENERATED_SOURCES := \ + $(LOCAL_PATH)/version.h \ + $(LOCAL_PATH)/config.h LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/lib \ @@ -70,7 +100,8 @@ skip_tests_list := \ kms_setmode \ pm_pc8 \ gem_seqno_wrap \ - gem_render_copy + gem_render_copy \ + pm_lpsp tests_list := $(filter-out $(skip_tests_list),$(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite)) -- 2.7.4