diff options
Diffstat (limited to 'src/intel/Android.vulkan.mk')
| -rw-r--r-- | src/intel/Android.vulkan.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 6fe736d3978..45c3633ba82 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -25,7 +25,7 @@ include $(LOCAL_PATH)/Makefile.sources VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_entrypoints_gen.py -VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_extensions.py +VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_extensions_gen.py VULKAN_COMMON_INCLUDES := \ $(MESA_TOP)/include \ @@ -82,6 +82,7 @@ ANV_INCLUDES := \ $(VULKAN_COMMON_INCLUDES) \ $(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_common,,)/vulkan \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util # @@ -232,6 +233,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.c LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.c +LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.h $(intermediates)/vulkan/anv_entrypoints.c: @mkdir -p $(dir $@) @@ -245,7 +247,14 @@ $(intermediates)/vulkan/anv_extensions.c: $(VK_EXTENSIONS_SCRIPT) \ --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \ --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \ - --out $@ + --out-c $@ + +$(intermediates)/vulkan/anv_extensions.h: + @mkdir -p $(dir $@) + $(VK_EXTENSIONS_SCRIPT) \ + --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \ + --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \ + --out-h $@ LOCAL_SHARED_LIBRARIES := libdrm @@ -272,7 +281,8 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(VULKAN_COMMON_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan |