From b34cae80906e1d9852a98ce303843b856466b987 Mon Sep 17 00:00:00 2001
From: Christophe <christophe@lunarg.com>
Date: Wed, 28 Jun 2023 13:43:34 +0200
Subject: [PATCH] build: Add layer settings library for Android build

---
 build-android/known_good.json          | 15 +++++++++++++++
 layers/decompression/decompression.cpp |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/build-android/known_good.json b/build-android/known_good.json
index 2bd4e890..41f4ed8a 100755
--- a/build-android/known_good.json
+++ b/build-android/known_good.json
@@ -8,6 +8,20 @@
             "install_dir": "Vulkan-Headers/build/install",
             "commit": "v1.3.261"
         },
+        {
+            "name": "Vulkan-Utility-Libraries",
+            "url": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git",
+            "sub_dir": "Vulkan-Utility-Libraries",
+            "build_dir": "Vulkan-Utility-Libraries/build",
+            "install_dir": "Vulkan-Utility-Libraries/build/install",
+            "commit": "c0525368d724896349b40d8aa7b779f32bbbed0c",
+            "deps": [
+                {
+                    "var_name": "VULKAN_HEADERS_INSTALL_DIR",
+                    "repo_name": "Vulkan-Headers"
+                }
+            ]
+        },
         {
             "name": "glslang",
             "url": "https://github.com/KhronosGroup/glslang.git",
@@ -30,6 +44,7 @@
     ],
     "install_names": {
         "Vulkan-Headers": "VULKAN_HEADERS_INSTALL_DIR",
+        "Vulkan-Utility-Libraries": "VULKAN_UTILITY_LIBRARIES_INSTALL_DIR",
         "glslang": "GLSLANG_INSTALL_DIR",
         "SPIRV-Headers": "SPIRV_HEADERS_INSTALL_DIR"
     }
diff --git a/layers/decompression/decompression.cpp b/layers/decompression/decompression.cpp
index 23c0bef0..b58cdcd6 100755
--- a/layers/decompression/decompression.cpp
+++ b/layers/decompression/decompression.cpp
@@ -125,7 +125,7 @@ std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
 namespace memory_decompression {
 
 static const VkLayerProperties kGlobalLayer = {
-    "VK_LAYER_KHRONOS_decompression",
+    "VK_LAYER_KHRONOS_memory_decompression",
     VK_HEADER_VERSION_COMPLETE,
     1,
     "Default memory decompression layer",