From a4cf3e437d58187ef8fc339dee23accfb9236855 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 5 Sep 2018 18:28:22 +0100
Subject: [PATCH] Fix duplicate function definitions on android

---
 renderdoc/driver/vulkan/vk_android.cpp | 11 -----------
 renderdoc/driver/vulkan/vk_posix.cpp   |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_android.cpp b/renderdoc/driver/vulkan/vk_android.cpp
index cdf6b0955..c3996dc09 100644
--- a/renderdoc/driver/vulkan/vk_android.cpp
+++ b/renderdoc/driver/vulkan/vk_android.cpp
@@ -85,14 +85,3 @@ void *LoadVulkanLibrary()
 {
   return Process::LoadModule("libvulkan.so");
 }
-
-bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vector<std::string> &myJSONs,
-                                    std::vector<std::string> &otherJSONs)
-{
-  // nothing to do
-  return false;
-}
-
-void VulkanReplay::InstallVulkanLayer(bool systemLevel)
-{
-}
diff --git a/renderdoc/driver/vulkan/vk_posix.cpp b/renderdoc/driver/vulkan/vk_posix.cpp
index 7fb901bc4..2cae7b1d3 100644
--- a/renderdoc/driver/vulkan/vk_posix.cpp
+++ b/renderdoc/driver/vulkan/vk_posix.cpp
@@ -320,6 +320,9 @@ void MakeParentDirs(std::string file)
 bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vector<std::string> &myJSONs,
                                     std::vector<std::string> &otherJSONs)
 {
+#if ENABLED(RDOC_ANDROID)
+  return false;
+#else
   // see if the user has suppressed all this checking as a "I know what I'm doing" measure
 
   if(FileExists(string(getenv("HOME")) + "/.renderdoc/ignore_vulkan_layer_issues"))
@@ -411,10 +414,12 @@ bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vector<std::st
   }
 
   return true;
+#endif
 }
 
 void VulkanReplay::InstallVulkanLayer(bool systemLevel)
 {
+#if DISABLED(RDOC_ANDROID)
   std::string homePath = LayerRegistrationPath(LayerPath::home);
 
   // if we want to install to the system and there's a registration in $HOME, delete it
@@ -463,4 +468,5 @@ void VulkanReplay::InstallVulkanLayer(bool systemLevel)
       RDCERR("Error writing %s: %s", jsonPath.c_str(), errtext);
     }
   }
+#endif
 }
\ No newline at end of file