vulkan: bump headers/registry to 1.1.127

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

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index b8ed706f1dec259f0d8cc1e4a0b86f3e94a068dc..71aa5e5f0bde948d352d179f6a400dff59bb5f63 100644 (file)
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -1,4 +1,5 @@
 # Copyright © 2017 Mauro Rossi <issor.oruam@gmail.com>
+# Copyright © 2017 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -35,21 +36,39 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 intermediates := $(call local-generated-sources-dir)
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/include/vulkan
+       $(MESA_TOP)/include/vulkan \
+       $(MESA_TOP)/src/vulkan/util
 
-LOCAL_GENERATED_SOURCES := \
-       $(intermediates)/util/vk_enum_to_str.c \
-       $(intermediates)/util/vk_enum_to_str.h
+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))
+
+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 $(vulkan_api_xml)
+$(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 --outdir $(intermediates)/util
+       $(hide) $(MESA_PYTHON2) $< \
+           --xml $(vulkan_api_xml) \
+           --outdir $(dir $@)
+
+$(lastword $(LOCAL_GENERATED_SOURCES)): $(firstword $(LOCAL_GENERATED_SOURCES))
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/util
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(intermediates)
+ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+LOCAL_SHARED_LIBRARIES += libnativewindow
+endif
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)