summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2018-02-04 22:57:11 +0100
committerTapani Pälli <[email protected]>2018-02-26 14:50:24 +0200
commit6451b0703ff3027b746d6268b98dd2b3e6698be5 (patch)
tree60bb724e472ace518661305f8afc9b033555bdae /src
parentd448954228e69fd1b4000ea13e28c2ba2832db13 (diff)
android: vulkan/util: add dependency on libnativewindow for O and later
Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building error: In file included from out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_vulkan_util_intermediates/util/vk_enum_to_str.c:26: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Cc: "18.0" <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/vulkan/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 6d6df938ab8..70b23eae08f 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -59,5 +59,9 @@ $(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
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)