Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Commit df502da

Browse files
tpallikalyankondapally
authored andcommitted
AndroidIA: add temporary workaround for build_id
This should be removed later when fixed in upstream. This fixes crash seen with Vulkan apps as well as 32bit GL applications. Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
1 parent cc0c81e commit df502da

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/intel/vulkan/anv_device.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ anv_physical_device_init_uuids(struct anv_physical_device *device)
230230
}
231231

232232
unsigned build_id_len = build_id_length(note);
233+
#ifndef ANDROID
233234
if (build_id_len < 20) {
234235
return vk_errorf(device->instance, device,
235236
VK_ERROR_INITIALIZATION_FAILED,
236237
"build-id too short. It needs to be a SHA");
237238
}
238-
239+
#endif
239240
struct mesa_sha1 sha1_ctx;
240241
uint8_t sha1[20];
241242
STATIC_ASSERT(VK_UUID_SIZE <= sizeof(sha1));

src/util/build_id.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ build_id_find_nhdr_callback(struct dl_phdr_info *info, size_t size, void *data_)
5858
{
5959
struct callback_data *data = data_;
6060

61+
#ifndef ANDROID
6162
if ((void *)info->dlpi_addr != data->dli_fbase)
6263
return 0;
64+
#endif
6365

6466
for (unsigned i = 0; i < info->dlpi_phnum; i++) {
6567
if (info->dlpi_phdr[i].p_type != PT_NOTE)

0 commit comments

Comments
 (0)