From 420131fd95f91cf9efa3128ca34cfde3a07a86e5 Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Mon, 1 Feb 2016 09:52:07 -0700
Subject: layers: MR217 Fix Android build of swapchain

---
 layers/swapchain.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 3edbba72..de9fc777 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <vk_loader_platform.h>
-#include <vk_icd.h>
+#include <vulkan/vk_icd.h>
 #include "swapchain.h"
 #include "vk_layer_extension_utils.h"
 #include "vk_enum_string_helper.h"
@@ -443,13 +443,13 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
     SwpInstance *pInstance = &(my_data->instanceMap[instance]);
 
     // Validate that the platform extension was enabled:
-    if (pInstance && !pInstance->SurfaceExtensionEnabled) {
+    if (pInstance && !pInstance->androidSurfaceExtensionEnabled) {
         skipCall |= LOG_ERROR(VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT,
                               pInstance,
                               "VkInstance",
                               SWAPCHAIN_EXT_NOT_ENABLED_BUT_USED,
                               "%s() called even though the %s extension was not enabled for this VkInstance.",
-                              __FUNCTION__, VK_KHR_x_SURFACE_EXTENSION_NAME);
+                              __FUNCTION__, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
     }
 
     if (!pCreateInfo) {
-- 
cgit v1.2.3