diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2020-07-23 22:50:32 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-05 22:23:21 +0200 |
| commit | 4fb918f45606a947c3414faca75ab4632622da03 (patch) | |
| tree | 284ed98c5c5e51ebb7d03d0baa600970d135b58b | |
| parent | d7158dcc12bb4ed0cae4998cdd6156b87e393077 (diff) | |
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: 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>
(cherry picked from commit 80c135e6a6ade34f451e694d1c54598a75b1243e)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_android.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1c3499b13af..2592c7990a7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1597,7 +1597,7 @@ "description": "radv: fix build on Android 7 (v2)", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "f36b52740a026c46f718a4cb63e70da0322d4b48" }, diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c index 567d2b1f1fa..68cb275ca2c 100644 --- a/src/amd/vulkan/radv_android.c +++ b/src/amd/vulkan/radv_android.c @@ -25,13 +25,13 @@ #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 |