diff --git a/.pick_status.json b/.pick_status.json index 75a48498e16..d1d5580fb2d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -481,7 +481,7 @@ "description": "AOSP: Add intel_hasvk vulkan library suffix", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/android/Android.mk b/android/Android.mk index 49fdd56443c..7f1f679391c 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -30,6 +30,7 @@ LIBDRM_VERSION = $(shell cat external/libdrm/meson.build | grep -o "\\ MESA_VK_LIB_SUFFIX_amd := radeon MESA_VK_LIB_SUFFIX_intel := intel +MESA_VK_LIB_SUFFIX_intel_hasvk := intel_hasvk MESA_VK_LIB_SUFFIX_freedreno := freedreno MESA_VK_LIB_SUFFIX_broadcom := broadcom MESA_VK_LIB_SUFFIX_panfrost := panfrost