android: add '/vulkan' to libmesa_anv_entrypoints path
authorTapani Pälli <tapani.palli@intel.com>
Mon, 13 Mar 2017 12:08:38 +0000 (14:08 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Tue, 14 Mar 2017 05:48:30 +0000 (07:48 +0200)
otherwise generated entrypoint headers are not found during build

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/intel/Android.vulkan.mk

index 65357af..40ec9a7 100644 (file)
@@ -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