From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
To: "Morton, Derek J" <derek.j.morton@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Cc: "Wood, Thomas" <thomas.wood@intel.com>
Subject: Re: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error
Date: Wed, 05 Aug 2015 16:59:34 +0100 [thread overview]
Message-ID: <55C232E6.6010901@intel.com> (raw)
In-Reply-To: <2D016F5BA44C744783BA96B1D3EBC5BD13E54A57@IRSMSX102.ger.corp.intel.com>
On 04/08/15 09:56, Morton, Derek J wrote:
> 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 <derek.j.morton@intel.com>
> ---
> benchmarks/Android.mk | 2 +-
> tools/Android.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> 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
This will append "_benchmark" also to modules which already have it in
the name (e.g. gem_userptr_benchmark). I'd go with:
ifneq (,$(findstring benchmark,$1))
LOCAL_MODULE := $1
else
LOCAL_MODULE := $1_benchmark
endif
Daniele
> 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
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-08-05 15:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 10:30 [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error Derek Morton
2015-08-04 8:56 ` Morton, Derek J
2015-08-05 15:59 ` Daniele Ceraolo Spurio [this message]
2015-08-06 8:27 ` Morton, Derek J
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55C232E6.6010901@intel.com \
--to=daniele.ceraolospurio@intel.com \
--cc=derek.j.morton@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.wood@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox