Commit 17d249a0 authored by maurossi's avatar maurossi Committed by Eric Engestrom
Browse files

radv: fix build on Android 7 (v2)

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: f36b5274

 "radv/android: Add android hardware buffer queries."
Reported-and-tested-by: youling 257's avataryouling 257 <youling257@gmail.com>
Signed-off-by: maurossi's avatarMauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Bas Nieuwenhuizen's avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <!6051>
(cherry picked from commit 80c135e6)
parent 0f8ffd6b
Pipeline #185274 passed with stages
in 20 minutes and 7 seconds
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"description": "radv: fix build on Android 7 (v2)", "description": "radv: fix build on Android 7 (v2)",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": "f36b52740a026c46f718a4cb63e70da0322d4b48" "because_sha": "f36b52740a026c46f718a4cb63e70da0322d4b48"
}, },
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
#include <hardware/gralloc.h> #include <hardware/gralloc.h>
#include <hardware/hardware.h> #include <hardware/hardware.h>
#include <hardware/hwvulkan.h> #include <hardware/hwvulkan.h>
#include <vndk/hardware_buffer.h>
#include <vulkan/vk_android_native_buffer.h> #include <vulkan/vk_android_native_buffer.h>
#include <vulkan/vk_icd.h> #include <vulkan/vk_icd.h>
#include <libsync.h> #include <libsync.h>
#if ANDROID_API_LEVEL >= 26 #if ANDROID_API_LEVEL >= 26
#include <hardware/gralloc1.h> #include <hardware/gralloc1.h>
#include <vndk/hardware_buffer.h>
#endif #endif
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment