From patchwork Thu Aug 13 10:27: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: 7007351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B14ECC05AC for ; Thu, 13 Aug 2015 10:27:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D329A20699 for ; Thu, 13 Aug 2015 10:27:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A4B932060B for ; Thu, 13 Aug 2015 10:27:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D5E46E147; Thu, 13 Aug 2015 03:27:47 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A00FE6E147 for ; Thu, 13 Aug 2015 03:27:45 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 13 Aug 2015 03:27:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,669,1432623600"; d="scan'208";a="767992758" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by fmsmga001.fm.intel.com with ESMTP; 13 Aug 2015 03:27:44 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Thu, 13 Aug 2015 11:27:35 +0100 Message-Id: <1439461655-1710-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] benckmarks/Android.mk: Fix building benchmarks for Android 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, 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 commit "benchmarks: Do not install to system-wide bin/" changed the benchmark file list from bin_PROGRAMS to benchmarks_PROGRAMS. However Android.mk was not updated, resulting in IGT failing to build for Android. This commit adds that change. It also adds LOCAL_MODULE_PATH to specify where the built benchmarks should be put. v2: I discovered that the existing definitions of LOCAL_MODULE_PATH were creating what should have been an invalid path. Not sure how it was ever working previously, but fixed now. Signed-off-by: Derek Morton --- benchmarks/Android.mk | 3 ++- lib/tests/Android.mk | 2 +- tests/Android.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index da11c44..207a177 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -19,6 +19,7 @@ define add_benchmark LOCAL_MODULE := $1_benchmark LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/benchmarks LOCAL_STATIC_LIBRARIES := libintel_gpu_tools @@ -31,6 +32,6 @@ endef #================# -benchmark_list := $(bin_PROGRAMS) +benchmark_list := $(benchmarks_PROGRAMS) $(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item)))) diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk index 7ad0300..df8e159 100644 --- a/lib/tests/Android.mk +++ b/lib/tests/Android.mk @@ -18,7 +18,7 @@ define add_test LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES} LOCAL_MODULE_TAGS := optional - LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt + LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt include $(BUILD_EXECUTABLE) endef diff --git a/tests/Android.mk b/tests/Android.mk index 10ef3e2..8457125 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -20,7 +20,7 @@ define add_test LOCAL_MODULE_TAGS := optional # ask linker to define a specific symbol; we use this to identify IGT tests LOCAL_LDFLAGS := -Wl,--defsym=$2=0 - LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt + LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt include $(BUILD_EXECUTABLE) endef