Completely remove layer registration code from android

renderdoc/driver/vulkan/vk_posix.cpp

@@ -189,6 +189,17 @@ string GetThisLibPath();
 extern unsigned char driver_vulkan_renderdoc_json[];
 extern int driver_vulkan_renderdoc_json_len;
 
+#if ENABLED(RDOC_ANDROID)
+bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vector<std::string> &myJSONs,
+                                    std::vector<std::string> &otherJSONs)
+{
+  return false;
+}
+
+void VulkanReplay::InstallVulkanLayer(bool systemLevel)
+{
+}
+#else
 static std::string GenerateJSON(const std::string &sopath)
 {
   char *txt = (char *)driver_vulkan_renderdoc_json;
@@ -320,9 +331,6 @@ 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"))
@@ -414,12 +422,10 @@ 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
@@ -468,5 +474,5 @@ void VulkanReplay::InstallVulkanLayer(bool systemLevel)
       RDCERR("Error writing %s: %s", jsonPath.c_str(), errtext);
     }
   }
-#endif
-}
+}
+#endif