anv/android: fix missing dependencies issue during parallel build

The libmesa_anv_gen* modules require anv_extensions.h, patch makes sure
it gets generated as a dependency before building them.

Signed-off-by: Chenglei Ren <chenglei.ren@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 05922afdbe08c1e6bd7ffb1de84fbd8e98d8d456..3c257e5853ebc2591012fc33e968256a967f7ea2 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -71,6 +71,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.h
 LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/dummy.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.h
 
 $(intermediates)/vulkan/dummy.c:
        @mkdir -p $(dir $@)
@@ -85,6 +86,14 @@ $(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c \
                --outdir $(dir $@) \
                --xml $(VULKAN_API_XML)
 
+$(intermediates)/vulkan/anv_extensions.h: $(ANV_ENTRYPOINTS_GEN_SCRIPT) \
+                                         $(ANV_EXTENSIONS_SCRIPT) \
+                                         $(VULKAN_API_XML)
+       @mkdir -p $(dir $@)
+       $(MESA_PYTHON2) $(ANV_EXTENSIONS_GEN_SCRIPT) \
+               --xml $(VULKAN_API_XML) \
+               --out-h $@
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         $(intermediates)
 
@@ -261,7 +270,6 @@ 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: $(ANV_ENTRYPOINTS_GEN_SCRIPT) \
                                           $(ANV_EXTENSIONS_SCRIPT) \
@@ -279,14 +287,6 @@ $(intermediates)/vulkan/anv_extensions.c: $(ANV_EXTENSIONS_GEN_SCRIPT) \
                --xml $(VULKAN_API_XML) \
                --out-c $@
 
-$(intermediates)/vulkan/anv_extensions.h: $(ANV_EXTENSIONS_GEN_SCRIPT) \
-                                          $(ANV_EXTENSIONS_SCRIPT) \
-                                          $(VULKAN_API_XML)
-       @mkdir -p $(dir $@)
-       $(MESA_PYTHON2) $(ANV_EXTENSIONS_GEN_SCRIPT) \
-               --xml $(VULKAN_API_XML) \
-               --out-h $@
-
 LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
 LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)