From d448954228e69fd1b4000ea13e28c2ba2832db13 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 26 Feb 2018 14:42:47 +0200 Subject: [PATCH] android: anv: add dependency on libnativewindow for O and later MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: 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" Reviewed-by: Tapani Pälli Reviewed-by: Emil Velikov --- src/intel/Android.vulkan.mk | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 45c3633ba82..07e69d890a5 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -85,6 +85,12 @@ ANV_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util +ANV_SHARED_LIBRARIES := libdrm + +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +ANV_SHARED_LIBRARIES += libnativewindow +endif + # # libanv for gen7 # @@ -100,7 +106,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -120,7 +126,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -140,7 +146,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -160,7 +166,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -180,7 +186,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -200,7 +206,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -256,7 +262,7 @@ $(intermediates)/vulkan/anv_extensions.h: --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \ --out-h $@ -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -304,7 +310,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_intel_compiler \ libmesa_anv_entrypoints -LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -- 2.11.0