From 13ef98f1f97b9fda9ce5c3c78d1c156dd5f2a164 Mon Sep 17 00:00:00 2001
From: Peng <tonypeng@amazon.com>
Date: Thu, 22 Apr 2021 14:31:29 -0700
Subject: [PATCH 1/2] [ATOM][RHI][Vulkan][Android] Fix VkValidation copy for
 new 3rd party system

JIRA: https://jira.agscollab.com/browse/ATOM-15175
---
 cmake/3rdParty/FindVkValidation.cmake                      | 3 +--
 cmake/3rdParty/Platform/Android/VkValidation_android.cmake | 2 +-
 cmake/3rdParty/cmake_files.cmake                           | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/3rdParty/FindVkValidation.cmake b/cmake/3rdParty/FindVkValidation.cmake
index 40588dd2a3..3767946602 100644
--- a/cmake/3rdParty/FindVkValidation.cmake
+++ b/cmake/3rdParty/FindVkValidation.cmake
@@ -11,6 +11,5 @@
 
 ly_add_external_target(
     NAME VkValidation
-    VERSION ${VKVALIDATION_VERSION}
-    3RDPARTY_DIRECTORY ${VKVALIDATION_3RDPARTY_PLATFORM_DIRECTORY}
+    VERSION ""
 )
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Android/VkValidation_android.cmake b/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
index 447bdb4332..ad219e3a79 100644
--- a/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
+++ b/cmake/3rdParty/Platform/Android/VkValidation_android.cmake
@@ -9,4 +9,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(VKVALIDATION_RUNTIME_DEPENDENCIES $<$<NOT:$<CONFIG:Release>>:${BASE_PATH}/sources/third_party/vulkan/src/build-android/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so>)
+set(VKVALIDATION_RUNTIME_DEPENDENCIES $<$<NOT:$<CONFIG:Release>>:${LY_NDK_DIR}/sources/third_party/vulkan/src/build-android/jniLibs/arm64-v8a/libVkLayer_khronos_validation.so>)
diff --git a/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake
index 0d8e6d4bb1..a3cec25928 100644
--- a/cmake/3rdParty/cmake_files.cmake
+++ b/cmake/3rdParty/cmake_files.cmake
@@ -20,6 +20,5 @@ set(FILES
     FindOpenGLInterface.cmake
     FindOpenSSL.cmake
     FindRadTelemetry.cmake
-    FindVkValidation.cmake
     FindWwise.cmake
 )

From 176f7fdef2483ce61a6e6083c04442b7e99e0a22 Mon Sep 17 00:00:00 2001
From: Peng <tonypeng@amazon.com>
Date: Fri, 23 Apr 2021 11:37:09 -0700
Subject: [PATCH 2/2] ATOM-15175 put back include vkvalidation cmake file again

---
 cmake/3rdParty/cmake_files.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake
index 46df8f4df8..9fc90e42e5 100644
--- a/cmake/3rdParty/cmake_files.cmake
+++ b/cmake/3rdParty/cmake_files.cmake
@@ -18,5 +18,6 @@ set(FILES
     FindOpenGLInterface.cmake
     FindOpenSSL.cmake
     FindRadTelemetry.cmake
+    FindVkValidation.cmake
     FindWwise.cmake
 )