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

[Derek Morton]

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.

v2: I discovered that the existing definitions of LOCAL_MODULE_PATH
were creating what should have been an invalid path. Not sure how it
was ever working previously, but fixed now.

Signed-off-by: Derek Morton <derek.j.morton at intel.com>
---
 benchmarks/Android.mk | 3 ++-
 lib/tests/Android.mk  | 2 +-
 tests/Android.mk      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index da11c44..207a177 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 := $(TARGET_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))))
diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk
index 7ad0300..df8e159 100644
--- a/lib/tests/Android.mk
+++ b/lib/tests/Android.mk
@@ -18,7 +18,7 @@ define add_test
     LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES}
 
     LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt
+    LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt
 
     include $(BUILD_EXECUTABLE)
 endef
diff --git a/tests/Android.mk b/tests/Android.mk
index 10ef3e2..8457125 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,7 +20,7 @@ define add_test
     LOCAL_MODULE_TAGS := optional
     # ask linker to define a specific symbol; we use this to identify IGT tests
     LOCAL_LDFLAGS := -Wl,--defsym=$2=0
-    LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt
+    LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt
 
     include $(BUILD_EXECUTABLE)
 endef
-- 
1.9.1