Mesa (main): radv: fix build errors after commit 8b7ff784

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ec1968dcc99f38a4a9ac2089373548a668e446b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec1968dcc99f38a4a9ac2089373548a668e446b7

Author: Yiwei Zhang <zzyiwei at chromium.org>
Date:   Tue Jun 15 05:34:15 2021 +0000

radv: fix build errors after commit 8b7ff784

Signed-off-by: Yiwei Zhang <zzyiwei at chromium.org>
Reviewed-by: Roman Stratiienko <r.stratiienko at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11373>

---

 src/amd/vulkan/radv_android.c | 1 -
 src/amd/vulkan/radv_private.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index fb3202a313f..d7ba58da058 100644
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -31,7 +31,6 @@
 
 #if ANDROID_API_LEVEL >= 26
 #include <hardware/gralloc1.h>
-#include <vndk/hardware_buffer.h>
 #endif
 #endif
 
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index e3feb84e613..b30c9db03d8 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -97,6 +97,7 @@ typedef uint32_t xcb_window_t;
  */
 #if defined(ANDROID) && ANDROID_API_LEVEL >= 26
 #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 1
+#include <vndk/hardware_buffer.h>
 #else
 #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 0
 #endif