Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> --- Android build system changes required for: https://lists.freedesktop.org/archives/mesa-dev/2017-June/158027.html
Android.common.mk | 1 + src/intel/Android.vulkan.mk | 1 + src/vulkan/Android.mk | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Android.common.mk b/Android.common.mk index bf4d709..c2de22b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -38,6 +38,7 @@ LOCAL_CFLAGS += \ -Wno-missing-field-initializers \ -Wno-initializer-overrides \ -Wno-mismatched-tags \ + -DVERSION=\"$(MESA_VERSION)\" \ -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index be23a00..0bca2ad 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -31,6 +31,7 @@ VULKAN_COMMON_INCLUDES := \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/vulkan/wsi \ + $(MESA_TOP)/src/vulkan/util \ $(MESA_TOP)/src/intel \ $(MESA_TOP)/src/intel/vulkan \ frameworks/native/libs/nativewindow/include \ diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk index 2e34093..c8b886d 100644 --- a/src/vulkan/Android.mk +++ b/src/vulkan/Android.mk @@ -44,6 +44,8 @@ LOCAL_C_INCLUDES := \ LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \ $(VULKAN_UTIL_GENERATED_FILES)) +LOCAL_SRC_FILES := $(VULKAN_UTIL_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) -- 2.9.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev