From patchwork Fri Jan 31 14:57:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rafael.barbalho@intel.com X-Patchwork-Id: 3563531 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05DDC9F381 for ; Fri, 31 Jan 2014 20:08:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2165F2024F for ; Fri, 31 Jan 2014 20:08:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 441E92022F for ; Fri, 31 Jan 2014 20:08:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B163107197 for ; Fri, 31 Jan 2014 12:08:14 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D930BF9CDF for ; Fri, 31 Jan 2014 06:57:57 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 31 Jan 2014 06:57:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,758,1384329600"; d="scan'208";a="475830746" Received: from rbarbalh-linux.isw.intel.com ([10.102.226.47]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2014 06:57:56 -0800 From: rafael.barbalho@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 31 Jan 2014 14:57:40 +0000 Message-Id: <1391180260-23101-6-git-send-email-rafael.barbalho@intel.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> References: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> Subject: [Intel-gfx] [PATCH 5/5] android: Change tests & tools directory to use the lib directory X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafael Barbalho 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 --- Android.mk | 5 +---- lib/Android.mk | 2 +- tests/Android.mk | 51 +++++---------------------------------------------- tools/Android.mk | 19 +++++-------------- 4 files changed, 12 insertions(+), 65 deletions(-) diff --git a/Android.mk b/Android.mk index 7b42d10..8aeb2d4 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,2 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/tests/Android.mk -include $(LOCAL_PATH)/tools/Android.mk +include $(call all-named-subdir-makefiles, lib tests tools) diff --git a/lib/Android.mk b/lib/Android.mk index 724d884..6735255 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -48,7 +48,7 @@ LOCAL_GENERATED_SOURCES := \ LOCAL_C_INCLUDES += \ $(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_STRUCT_SYSINFO_TOTALRAM diff --git a/tests/Android.mk b/tests/Android.mk index 0e292a9..30be4a6 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,56 +1,13 @@ -include $(LOCAL_PATH)/tests/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)) -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"' >> $@ ; +include $(LOCAL_PATH)/Makefile.sources #================# define add_test include $(CLEAR_VARS) - 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 + LOCAL_SRC_FILES := $1.c LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" @@ -63,6 +20,8 @@ define add_test LOCAL_MODULE := $1 LOCAL_MODULE_TAGS := optional + LOCAL_STATIC_LIBRARIES := libintel_gpu_tools + LOCAL_SHARED_LIBRARIES := libpciaccess \ libdrm \ libdrm_intel diff --git a/tools/Android.mk b/tools/Android.mk index 7227c89..a957ec1 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