radv: fix build on Android 7 (v2)
authorMauro Rossi <issor.oruam@gmail.com>
Thu, 23 Jul 2020 20:50:32 +0000 (22:50 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 30 Jul 2020 17:10:31 +0000 (17:10 +0000)
Fixes the following building error:

external/mesa/src/amd/vulkan/radv_android.c:28:10: fatal error:
'vndk/hardware_buffer.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~

(v2) use the existing preprocessor condition #if ANDROID_API_LEVEL >= 26

Fixes: f36b527 "radv/android: Add android hardware buffer queries."
Reported-and-tested-by: youling 257 <youling257@gmail.com>
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6051>

src/amd/vulkan/radv_android.c

index 6be0391b8d9eace9768e1cf623f2d9e0001a300d..b445b30e0ff6606d06c21f4ef13e240ef2f63e72 100644 (file)
 #include <hardware/gralloc.h>
 #include <hardware/hardware.h>
 #include <hardware/hwvulkan.h>
-#include <vndk/hardware_buffer.h>
 #include <vulkan/vk_android_native_buffer.h>
 #include <vulkan/vk_icd.h>
 #include <libsync.h>
 
 #if ANDROID_API_LEVEL >= 26
 #include <hardware/gralloc1.h>
+#include <vndk/hardware_buffer.h>
 #endif
 #endif