flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-07 16:06:25 +00:00
Code Issues Releases Wiki Activity

benckmarks/Android.mk: Fix building benchmarks for Android

Browse Source 
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@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Derek Morton 2015-08-13 11:27:35 +01:00 committed by Thomas Wood
parent 33bc41aa41
commit d524a964fc
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
benchmarks/Android.mk
View File

@ -19,6 +19,7 @@ define add_benchmark
LOCAL_MODULE := $1_benchmark LOCAL_MODULE := $1_benchmark
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/benchmarks
LOCAL_STATIC_LIBRARIES := libintel_gpu_tools 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)))) $(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))

2
lib/tests/Android.mk
View File

@ -18,7 +18,7 @@ define add_test
LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES} LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES}
LOCAL_MODULE_TAGS := optional 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) include $(BUILD_EXECUTABLE)
endef endef

2
tests/Android.mk
View File

@ -20,7 +20,7 @@ define add_test
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
# ask linker to define a specific symbol; we use this to identify IGT tests # ask linker to define a specific symbol; we use this to identify IGT tests
LOCAL_LDFLAGS := -Wl,--defsym=$2=0 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) include $(BUILD_EXECUTABLE)
endef endef