Commit d524a964 authored by Derek Morton's avatar Derek Morton Committed by Thomas Wood

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.

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: default avatarDerek Morton <derek.j.morton@intel.com>
Signed-off-by: default avatarThomas Wood <thomas.wood@intel.com>
parent 33bc41aa
......@@ -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))))
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment