flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-25 18:57:41 +00:00
Code Issues Releases Wiki Activity

android: Change tests & tools directory to use the lib directory

Browse Source 
Instead of recompiling the lib directory for every tool or tests we can just
re-use the static library. This also has the nice side effect of fixing the
android "mm" command to allow android users to only rebuild the local changes
in either the test or tools directory.

Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Rafael Barbalho 2014-01-31 14:57:40 +00:00 committed by Damien Lespiau
parent bdb08f981c
commit 09bcb0ab4b
4 changed files with 12 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@ -1,5 +1,2 @@
LOCAL_PATH := $(call my-dir) include $(call all-named-subdir-makefiles, lib tests tools)
include $(LOCAL_PATH)/tests/Android.mk
include $(LOCAL_PATH)/tools/Android.mk

2
lib/Android.mk
View File

@ -48,7 +48,7 @@ LOCAL_GENERATED_SOURCES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/.. $(LOCAL_PATH)/..
LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_CFLAGS += -DHAVE_LIBDRM_ATOMIC_PRIMITIVES LOCAL_CFLAGS += -DHAVE_LIBDRM_ATOMIC_PRIMITIVES
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM

51
tests/Android.mk
View File

@ -1,56 +1,13 @@
include $(LOCAL_PATH)/tests/Makefile.sources LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/lib/Makefile.sources
skip_lib_list := \ include $(LOCAL_PATH)/Makefile.sources
igt_kms.c \
igt_kms.h
lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
LIB_SOURCES := $(addprefix lib/,$(lib_list))
GPU_TOOLS_PATH := $(LOCAL_PATH)
.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 $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h; then \
mv $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h ; \
else \
rm $(GPU_TOOLS_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 define add_test
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := $1.c
tests/$1.c \
$(LIB_SOURCES)
LOCAL_GENERATED_SOURCES := \
$(LOCAL_PATH)/version.h \
$(LOCAL_PATH)/config.h
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/lib
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"
@ -63,6 +20,8 @@ define add_test
LOCAL_MODULE := $1 LOCAL_MODULE := $1
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
LOCAL_SHARED_LIBRARIES := libpciaccess \ LOCAL_SHARED_LIBRARIES := libpciaccess \
libdrm \ libdrm \
libdrm_intel libdrm_intel

19
tools/Android.mk
View File

@ -1,24 +1,13 @@
include $(LOCAL_PATH)/tools/Makefile.sources LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/lib/Makefile.sources
skip_lib_list := \ include $(LOCAL_PATH)/Makefile.sources
igt_kms.c \
igt_kms.h
lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
LIB_SOURCES := $(addprefix lib/,$(lib_list))
#================# #================#
define add_tool define add_tool
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := $1.c
tools/$1.c \
$(LIB_SOURCES)
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/lib
LOCAL_CFLAGS += -DHAVE_TERMIOS_H LOCAL_CFLAGS += -DHAVE_TERMIOS_H
LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
@ -32,6 +21,8 @@ define add_tool
LOCAL_MODULE := $1 LOCAL_MODULE := $1
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
LOCAL_SHARED_LIBRARIES := libpciaccess \ LOCAL_SHARED_LIBRARIES := libpciaccess \
libdrm \ libdrm \
libdrm_intel libdrm_intel