Skip to contentSkip to conversation

benchmarks/Android.mk, tools/Android.mk: Fix android build error

PATCH Superseded Derek Morton 2 participants 4 messages Jul 27, 2015 – Aug 6, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 benchmarks/Android.mk | 2 +-
 tools/Android.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
benchmarks/Android.mk +1 -1
index 14fc0a7..da11c44 100644
@@ -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
tools/Android.mk +1 -1
index 6617f28..0a196e4 100644
@@ -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
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

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: [email protected]
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.

---
 benchmarks/Android.mk | 2 +-
 tools/Android.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
benchmarks/Android.mk +1 -1
@@ -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
tools/Android.mk +1 -1
@@ -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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 25 lines · Derek J

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: [email protected]
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.

---
  benchmarks/Android.mk | 2 +-
  tools/Android.mk      | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

benchmarks/Android.mk define add_benchmark · line 20

Quoted 5 lines
benchmarks/Android.mk +1 -1
@@ -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

Quoted 17 lines
benchmarks/Android.mk +0 -0
      LOCAL_MODULE_TAGS := optional
 
      LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 6617f28..0a196e4 100644
tools/Android.mk +1 -2
@@ -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

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

I will submit another patch.

//Derek

-----Original Message-----
From: Ceraolo Spurio, Daniele
Sent: Wednesday, August 5, 2015 5:00 PM
To: Morton, Derek J; [email protected]
Cc: Wood, Thomas
Subject: Re: [Intel-gfx] [PATCH i-g-t] benchmarks/Android.mk, tools/Android.mk: Fix android build error

Quoted 27 lines · Derek J

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: [email protected]
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.

---
  benchmarks/Android.mk | 2 +-
  tools/Android.mk      | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
benchmarks/Android.mk index renamed from benchmarks/Android.mk +0 -0

14fc0a7..da11c44 100644

benchmarks/Android.mk define add_benchmark · line 20

Quoted 5 lines
benchmarks/Android.mk +1 -1
@@ -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

Quoted 19 lines
benchmarks/Android.mk +0 -0
      LOCAL_MODULE_TAGS := optional
 
      LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git 

a/tools/Android.mk b/tools/Android.mk index 6617f28..0a196e4 100644

tools/Android.mk +0 -0
@@ -25,7 +25,7 @@ define add_tool
      LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib
      LOCAL_C_INCLUDES += 

${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm

tools/Android.mk +1 -2
-    LOCAL_MODULE := $1
+    LOCAL_MODULE := $1_tool
      LOCAL_MODULE_TAGS := optional
 
      LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
--

1.9.1

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx