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@xxxxxxxxxxxxxxxxxxxxx
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@xxxxxxxxx>
---
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@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
