[i-g-t] benckmarks/Android.mk: Fix building benchmarks for Android

Commit Message

Derek Morton Aug. 13, 2015, 9:30 a.m. UTC

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(-)

Patch

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index da11c44..ed9a903 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -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))))