Mesa (master): android: add '/vulkan' to libmesa_anv_entrypoints path

Tapani Pälli tpalli at kemper.freedesktop.org
Tue Mar 14 05:49:21 UTC 2017


Module: Mesa
Branch: master
Commit: 773d510c66a6e7058ffb290ff4ac5b8842e6ee56
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=773d510c66a6e7058ffb290ff4ac5b8842e6ee56

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Mon Mar 13 14:08:38 2017 +0200

android: add '/vulkan' to libmesa_anv_entrypoints path

otherwise generated entrypoint headers are not found during build

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/Android.vulkan.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 65357af..40ec9a7 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -73,7 +73,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 ANV_INCLUDES := \
 	$(VULKAN_COMMON_INCLUDES) \
-	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,) \
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
 	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
 	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
 
@@ -204,7 +204,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	$(VULKAN_COMMON_INCLUDES) \
-	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan
 




More information about the mesa-commit mailing list