diff options
| author | Rafael Barbalho <rafael.barbalho@intel.com> | 2014-01-31 14:57:40 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-02-04 10:52:15 +0000 |
| commit | 09bcb0ab4b79273cfccdfa87f860b0be1addcc7b (patch) | |
| tree | d1c425bbc969334f37f49d0337b9620a6af0addf /tools | |
| parent | bdb08f981c5ebed0ff1f0067f1aa085636b9ac7b (diff) | |
android: Change tests & tools directory to use the lib directory
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Android.mk | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/tools/Android.mk b/tools/Android.mk index 7227c896..a957ec13 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -1,24 +1,13 @@ -include $(LOCAL_PATH)/tools/Makefile.sources -include $(LOCAL_PATH)/lib/Makefile.sources +LOCAL_PATH := $(call my-dir) -skip_lib_list := \ - igt_kms.c \ - igt_kms.h - -lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES)) -LIB_SOURCES := $(addprefix lib/,$(lib_list)) +include $(LOCAL_PATH)/Makefile.sources #================# define add_tool include $(CLEAR_VARS) - LOCAL_SRC_FILES := \ - tools/$1.c \ - $(LIB_SOURCES) - - LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/lib + LOCAL_SRC_FILES := $1.c LOCAL_CFLAGS += -DHAVE_TERMIOS_H LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM @@ -32,6 +21,8 @@ define add_tool LOCAL_MODULE := $1 LOCAL_MODULE_TAGS := optional + LOCAL_STATIC_LIBRARIES := libintel_gpu_tools + LOCAL_SHARED_LIBRARIES := libpciaccess \ libdrm \ libdrm_intel |