nir: Drop support for lower_b2f

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

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 0825c1ac108b1e6c7386656a761bec8bb1d42ddb..6253f1c3be9faa17badef784a1ac4c056af1ea36 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,20 +36,30 @@ 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 := $(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)
+$(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) $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
+           --xml $(vulkan_api_xml) \
+           --outdir $(dir $@)
 
 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)