diff options
| -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 |