* [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error @ 2015-07-27 10:30 Derek Morton 2015-08-04 8:56 ` Morton, Derek J 0 siblings, 1 reply; 4+ messages in thread From: Derek Morton @ 2015-07-27 10:30 UTC (permalink / raw) To: intel-gfx; +Cc: thomas.wood 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 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error 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 0 siblings, 1 reply; 4+ messages in thread From: Morton, Derek J @ 2015-08-04 8:56 UTC (permalink / raw) To: intel-gfx@lists.freedesktop.org; +Cc: Wood, Thomas 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 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error 2015-08-04 8:56 ` Morton, Derek J @ 2015-08-05 15:59 ` Daniele Ceraolo Spurio 2015-08-06 8:27 ` Morton, Derek J 0 siblings, 1 reply; 4+ messages in thread From: Daniele Ceraolo Spurio @ 2015-08-05 15:59 UTC (permalink / raw) To: Morton, Derek J, intel-gfx@lists.freedesktop.org; +Cc: Wood, Thomas 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error 2015-08-05 15:59 ` Daniele Ceraolo Spurio @ 2015-08-06 8:27 ` Morton, Derek J 0 siblings, 0 replies; 4+ messages in thread From: Morton, Derek J @ 2015-08-06 8:27 UTC (permalink / raw) To: Ceraolo Spurio, Daniele, intel-gfx@lists.freedesktop.org; +Cc: Wood, Thomas I will submit another patch. //Derek -----Original Message----- From: Ceraolo Spurio, Daniele Sent: Wednesday, August 5, 2015 5:00 PM To: Morton, Derek J; intel-gfx@lists.freedesktop.org Cc: Wood, Thomas Subject: Re: [Intel-gfx] [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-06 8:28 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 2015-08-06 8:27 ` Morton, Derek J
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox