| Message ID | 1439459430-16287-1-git-send-email-derek.j.morton@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This is the same as the previously sent patch but with Signed-off-by added to the commit message. //Derek > > >-----Original Message----- >From: Morton, Derek J >Sent: Thursday, August 13, 2015 10:51 AM >To: intel-gfx@lists.freedesktop.org >Cc: Wood, Thomas; Gore, Tim; chris@chris-wilson.co.uk; 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. > >Signed-off-by: Derek Morton <derek.j.morton@intel.com> >--- > benchmarks/Android.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >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)))) >-- >1.9.1 > >
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))))
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. Signed-off-by: Derek Morton <derek.j.morton@intel.com> --- benchmarks/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)