From 4ea5a744f27b47ef99b45cb04329ab6d2549fcfe Mon Sep 17 00:00:00 2001
From: Eduardo Menges Mattje <eduardomattje@gmail.com>
Date: Thu, 26 Sep 2024 08:32:35 -0300
Subject: [PATCH] Fixed CI for Android

---
 .github/workflows/test-build.yml | 1 -
 build/Android/Boost-for-Android  | 2 +-
 build/CommonTargets.CMake        | 6 +++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index e5cab44f..ccf141b8 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -7,7 +7,6 @@ jobs:
   build:
     env:
       GRPC_BUILD_ENABLE_CCACHE: "ON"
-      CMAKE_NO_VERBOSE: "ON"
     runs-on: ${{matrix.host}}
     strategy:
       fail-fast: false
diff --git a/build/Android/Boost-for-Android b/build/Android/Boost-for-Android
index f1256ac6..510cea82 160000
--- a/build/Android/Boost-for-Android
+++ b/build/Android/Boost-for-Android
@@ -1 +1 @@
-Subproject commit f1256ac6672e30a105cfae213050f065da3bc9c5
+Subproject commit 510cea82bf5b99516ec035bea8baf0d4620a66b9
diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake
index 02c6d96d..e4300c8c 100644
--- a/build/CommonTargets.CMake
+++ b/build/CommonTargets.CMake
@@ -371,6 +371,10 @@ if(NOT ANDROID AND NOT IOS)
         ${_CMAKE_COMMON_CACHE_ARGS}
         DEPENDS Vulkan-Headers
     )
+
+    set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader")
+    set(vulkanTarget Vulkan-Loader)
+    message("VULKAN_SDK: ${$ENV{VULKAN_SDK}}")
 endif()
 
 # MNN
@@ -387,7 +391,7 @@ ExternalProject_Add(MNN
     -DMNN_WIN_RUNTIME_MT:BOOL=ON
     ${_CMAKE_COMMON_CACHE_ARGS}
     ${_MNN_EXTRA_PARAM}
-    DEPENDS ${_MNN_DEPENDS}
+    DEPENDS ${_MNN_DEPENDS} ${vulkanTarget}
 )
 
 set(_FINDPACKAGE_MNN_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib/cmake/mnn")