From patchwork Thu Aug 6 08:37:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 6957301 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 512A3C05AC for ; Thu, 6 Aug 2015 08:38:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7621020561 for ; Thu, 6 Aug 2015 08:38:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 41BC42050E for ; Thu, 6 Aug 2015 08:38:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92C386EAF9; Thu, 6 Aug 2015 01:38:07 -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 A57FD6EAF9 for ; Thu, 6 Aug 2015 01:38:05 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 06 Aug 2015 01:38:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,622,1432623600"; d="scan'208";a="620350321" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by orsmga003.jf.intel.com with ESMTP; 06 Aug 2015 01:38:04 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Thu, 6 Aug 2015 09:37:58 +0100 Message-Id: <1438850278-817-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] benchmarks/Android.mk, tools/Android.mk: Fix android build error 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.3 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 Recently added tools / benckmarks have the same module name as existing tests. Android does not allow duplicate modules. This patch appends _benchmark and _tool to the module names used when building benckmarks and tools to prevent complie errors due to clashes with tests of the same name. v2: Don't add test/benchmark to the module name if the source already has the suffix. Signed-off-by: Derek Morton --- benchmarks/Android.mk | 6 +++++- tools/Android.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 14fc0a7..f75888d 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -17,7 +17,11 @@ define add_benchmark # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare - LOCAL_MODULE := $1 + ifneq (,$(findstring benchmark,$1)) + LOCAL_MODULE := $1 + else + LOCAL_MODULE := $1_benchmark + endif LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 6617f28..c8b5744 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -25,7 +25,11 @@ define add_tool LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm - LOCAL_MODULE := $1 + ifneq (,$(findstring tool,$1)) + LOCAL_MODULE := $1 + else + LOCAL_MODULE := $1_tool + endif LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools