libvulkan: Fix for -Wcast-calling-convention

It should be harmless, as NoOp does not use any argument and should never
be reached.

Bug: 30290462
Change-Id: I0592c3ce10c510713525b5aa0bd38a2f9adc5898

diff --git a/vulkan/libvulkan/Android.mk b/vulkan/libvulkan/Android.mk
index 4d2cffc..f1155ca 100644 (file)
--- a/vulkan/libvulkan/Android.mk
+++ b/vulkan/libvulkan/Android.mk
@@ -25,8 +25,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"vulkan\" \
        -Weverything -Werror \
        -Wno-padded \
        -Wno-switch-enum \
-       -Wno-undef \
-       -Wno-cast-calling-convention
+       -Wno-undef
 
 #LOCAL_CFLAGS += -DLOG_NDEBUG=0
 LOCAL_CPPFLAGS := -std=c++14 \

diff --git a/vulkan/libvulkan/stubhal.cpp b/vulkan/libvulkan/stubhal.cpp
index a74d370..869317b 100644 (file)
--- a/vulkan/libvulkan/stubhal.cpp
+++ b/vulkan/libvulkan/stubhal.cpp
@@ -43,7 +43,7 @@ static std::mutex g_instance_mutex;
 static std::bitset<kMaxInstances> g_instance_used(false);
 static std::array<hwvulkan_dispatch_t, kMaxInstances> g_instances;
 
-[[noreturn]] void NoOp() {
+[[noreturn]] VKAPI_ATTR void NoOp() {
     LOG_ALWAYS_FATAL("invalid stub function called");
 }