From patchwork Wed Sep 9 16:51:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 7147571 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5654D9F314 for ; Wed, 9 Sep 2015 16:52:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B919209FA for ; Wed, 9 Sep 2015 16:52:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5CC3B2098C for ; Wed, 9 Sep 2015 16:52:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B92B06EC66; Wed, 9 Sep 2015 09:52:01 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A5C66EC66 for ; Wed, 9 Sep 2015 09:52:00 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 09 Sep 2015 09:51:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,497,1437462000"; d="scan'208";a="558426195" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by FMSMGA003.fm.intel.com with ESMTP; 09 Sep 2015 09:51:38 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Sep 2015 17:51:35 +0100 Message-Id: <1441817495-7145-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t v2] tools/Android.mk: Fix compile error in intel_reg.c X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 The patch "tools: install the register definition files" caused a build error on android as it added 'PKGDATADIR' which was not defined in the Android build environment. This patch adds that define to tools/Android.mk. It also copies the files it points to so they are actually in the target file system. v2: Added local variable for tool path Signed-off-by: Derek Morton --- tools/Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/Android.mk b/tools/Android.mk index 0a196e4..934d3a1 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources +LOCAL_TOOLS_DIR := intel/validation/core/igt/tools + #================# define add_tool @@ -34,11 +36,21 @@ define add_tool libdrm \ libdrm_intel + # Tools dir on host + LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR) + # Tools dir on target. + LOCAL_CFLAGS += -DPKGDATADIR=\"/system/vendor/$(LOCAL_TOOLS_DIR)\" + include $(BUILD_EXECUTABLE) endef #================# +# Copy the register files +$(shell mkdir -p $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers) +$(shell cp $(LOCAL_PATH)/registers/* $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers) + + skip_tools_list := \ intel_framebuffer_dump \ intel_reg_dumper \