[i-g-t,v2] benchmarks/Android.mk, tools/Android.mk: Fix android build error

Commit Message

Derek Morton Aug. 6, 2015, 8:37 a.m. UTC

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 <[e-mail]>
---
 benchmarks/Android.mk | 6 +++++-
 tools/Android.mk      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

Patch

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