From 359d801bbda3b7ed96e23bd6ff8a633e98197746 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@google.com>
Date: Fri, 22 Jul 2016 10:36:33 +0800
Subject: [PATCH] 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
---
 vulkan/libvulkan/Android.mk  | 3 +--
 vulkan/libvulkan/stubhal.cpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vulkan/libvulkan/Android.mk b/vulkan/libvulkan/Android.mk
index 4d2cffcba7..f1155ca47b 100644
--- 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 a74d3708e0..869317bcb9 100644
--- 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");
 }
 
-- 
2.11.0