vulkan/wsi: Provide the implicitly synchronized BO to vkQueueSubmit

[mesa.git] / src / vulkan / Android.mk

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 6253f1c3be9faa17badef784a1ac4c056af1ea36..71aa5e5f0bde948d352d179f6a400dff59bb5f63 100644 (file)
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -39,6 +39,14 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include/vulkan \
        $(MESA_TOP)/src/vulkan/util
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_C_INCLUDES += \
+       frameworks/native/libs/nativebase/include \
+       frameworks/native/libs/nativewindow/include \
+       frameworks/native/libs/arect/include
+LOCAL_HEADER_LIBRARIES += libcutils_headers libsystem_headers
+endif
+
 LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \
        $(VULKAN_UTIL_GENERATED_FILES))
 
@@ -46,16 +54,17 @@ LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES)
 
 vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
 
-$(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
+$(firstword $(LOCAL_GENERATED_SOURCES)): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
                $(vulkan_api_xml)
        @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
        @mkdir -p $(dir $@)
-       $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
+       $(hide) $(MESA_PYTHON2) $< \
            --xml $(vulkan_api_xml) \
            --outdir $(dir $@)
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(intermediates)
+$(lastword $(LOCAL_GENERATED_SOURCES)): $(firstword $(LOCAL_GENERATED_SOURCES))
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/util
 
 ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
 LOCAL_SHARED_LIBRARIES += libnativewindow