Skip to contentSkip to conversation

benckmarks/Android.mk: Fix building benchmarks for Android

PATCH Superseded Derek Morton 1 participant 2 messages Aug 13, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 benckmarks/Android.mk: Fix building benchmarks for Android

The commit "benchmarks: Do not install to system-wide bin/" changed the benchmark file list from bin_PROGRAMS to benchmarks_PROGRAMS. However Android.mk was not updated, resulting in IGT failing to build for Android.
This commit adds that change. It also adds LOCAL_MODULE_PATH to specify where the built benchmarks should be put.

---
 benchmarks/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
benchmarks/Android.mk +2 -1
index da11c44..ed9a903 100644
@@ -19,6 +19,7 @@ define add_benchmark
 
     LOCAL_MODULE := $1_benchmark
     LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt/benchmarks
 
     LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
 
@@ -31,6 +32,6 @@ endef
 
 #================#
 
-benchmark_list := $(bin_PROGRAMS)
+benchmark_list := $(benchmarks_PROGRAMS)
 
 $(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))
Signature · 6 lines
1.9.1

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

This is the same as the previously sent patch but with Signed-off-by added to the commit message.

//Derek

Quoted 40 lines

-----Original Message-----
From: Morton, Derek J
Sent: Thursday, August 13, 2015 10:51 AM
To: [email protected]
Cc: Wood, Thomas; Gore, Tim; [email protected]; Morton, Derek J
Subject: [PATCH i-g-t] benckmarks/Android.mk: Fix building benchmarks for Android

The commit "benchmarks: Do not install to system-wide bin/" changed the benchmark file list from bin_PROGRAMS to benchmarks_PROGRAMS. However Android.mk was not updated, resulting in IGT failing to build for Android.
This commit adds that change. It also adds LOCAL_MODULE_PATH to specify where the built benchmarks should be put.

---
benchmarks/Android.mk | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
benchmarks/Android.mk +4 -2
@@ -19,6 +19,7 @@ define add_benchmark
 
    LOCAL_MODULE := $1_benchmark
    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE_PATH := 
+ $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core
+ /igt/benchmarks
 
    LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
@@ -31,6 +32,6 @@ endef
 
 #================#
 
-benchmark_list := $(bin_PROGRAMS)
+benchmark_list := $(benchmarks_PROGRAMS)
 
 $(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))
--
Quoted 3 lines

1.9.1

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