From patchwork Tue Aug 4 08:56:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 6935301 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 525459F38B for ; Tue, 4 Aug 2015 08:57:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84EF520641 for ; Tue, 4 Aug 2015 08:57:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 97D5120642 for ; Tue, 4 Aug 2015 08:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE1BD6E738; Tue, 4 Aug 2015 01:57:13 -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 C2ED96E737 for ; Tue, 4 Aug 2015 01:57:12 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 04 Aug 2015 01:56:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,607,1432623600"; d="scan'208";a="741779392" Received: from irsmsx103.ger.corp.intel.com ([163.33.3.157]) by orsmga001.jf.intel.com with ESMTP; 04 Aug 2015 01:56:44 -0700 Received: from irsmsx111.ger.corp.intel.com (10.108.20.4) by IRSMSX103.ger.corp.intel.com (163.33.3.157) with Microsoft SMTP Server (TLS) id 14.3.224.2; Tue, 4 Aug 2015 09:56:43 +0100 Received: from irsmsx102.ger.corp.intel.com ([169.254.2.158]) by irsmsx111.ger.corp.intel.com ([169.254.2.31]) with mapi id 14.03.0224.002; Tue, 4 Aug 2015 09:56:43 +0100 From: "Morton, Derek J" To: "intel-gfx@lists.freedesktop.org" Thread-Topic: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error Thread-Index: AQHQyFdtMKpPhV7HXESC+9gjY6x+cJ37leDA Date: Tue, 4 Aug 2015 08:56:43 +0000 Message-ID: <2D016F5BA44C744783BA96B1D3EBC5BD13E54A57@IRSMSX102.ger.corp.intel.com> References: <1437993058-16387-1-git-send-email-derek.j.morton@intel.com> In-Reply-To: <1437993058-16387-1-git-send-email-derek.j.morton@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] MIME-Version: 1.0 Cc: "Wood, Thomas" Subject: Re: [Intel-gfx] [PATCH i-g-t] 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: , 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 Bump. Can this be merged? It only affects android and addresses an issue causing igt to fail to build at all on android. //Derek -----Original Message----- From: Morton, Derek J Sent: Monday, July 27, 2015 11:31 AM To: intel-gfx@lists.freedesktop.org Cc: Wood, Thomas; Gore, Tim; Morton, Derek J Subject: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error 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 clashes with tests of the same name. Signed-off-by: Derek Morton --- benchmarks/Android.mk | 2 +- tools/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 14fc0a7..da11c44 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -17,7 +17,7 @@ define add_benchmark # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare - LOCAL_MODULE := $1 + LOCAL_MODULE := $1_benchmark LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 6617f28..0a196e4 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -25,7 +25,7 @@ define add_tool LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm - LOCAL_MODULE := $1 + LOCAL_MODULE := $1_tool LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libintel_gpu_tools