From 742a9b8b49043b3e2f58e15cb593fcd25dc99334 Mon Sep 17 00:00:00 2001
From: Tal Regev <tal.regev@gmail.com>
Date: Fri, 20 May 2022 18:43:21 +0300
Subject: [PATCH] Test android openssl fix

---
 3rdParty/vcpkg_ports/vcpkg_link.sh     |  2 +-
 android/ci_build_libs_cmake.sh         |  2 +-
 android/vcpkg_config_apps/vcpkg.json   |  9 +--------
 android/vcpkg_config_client/vcpkg.json |  9 +--------
 android/vcpkg_config_libs/vcpkg.json   |  9 +--------
 lib/vcpkg_config_android/vcpkg.json    | 15 ---------------
 6 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 lib/vcpkg_config_android/vcpkg.json

diff --git a/3rdParty/vcpkg_ports/vcpkg_link.sh b/3rdParty/vcpkg_ports/vcpkg_link.sh
index ff549af4831..29968359fdb 100644
--- a/3rdParty/vcpkg_ports/vcpkg_link.sh
+++ b/3rdParty/vcpkg_ports/vcpkg_link.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-export VCPKG_LINK=https://github.com/microsoft/vcpkg
+export VCPKG_LINK="https://github.com/AenBleidd/vcpkg -b vko_fix_openssl3_issue_on_android_x86"
diff --git a/android/ci_build_libs_cmake.sh b/android/ci_build_libs_cmake.sh
index 67ecabe21cc..26afe5adfad 100755
--- a/android/ci_build_libs_cmake.sh
+++ b/android/ci_build_libs_cmake.sh
@@ -35,7 +35,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
         export ANDROID_NDK_HOME=$NDK_ROOT
     fi
     BUILD_TRIPLET=build-$TRIPLET
-    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_MANIFEST_DIR=lib/vcpkg_config_android -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
     cmake --build $BUILD_TRIPLET
 
     echo "\e[1;32m $TRIPLET done \e[0m"
diff --git a/android/vcpkg_config_apps/vcpkg.json b/android/vcpkg_config_apps/vcpkg.json
index 9af8c9a00f6..41df54e8dae 100644
--- a/android/vcpkg_config_apps/vcpkg.json
+++ b/android/vcpkg_config_apps/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-apps",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -10,11 +9,5 @@
           "default-features": false
         },
         "rappture"
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/android/vcpkg_config_client/vcpkg.json b/android/vcpkg_config_client/vcpkg.json
index 6d2b503b891..a11a482227f 100644
--- a/android/vcpkg_config_client/vcpkg.json
+++ b/android/vcpkg_config_client/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-client",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -9,11 +8,5 @@
           "features": ["openssl"],
           "default-features": false
         }
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/android/vcpkg_config_libs/vcpkg.json b/android/vcpkg_config_libs/vcpkg.json
index 672745fc88f..184a0d589ed 100644
--- a/android/vcpkg_config_libs/vcpkg.json
+++ b/android/vcpkg_config_libs/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-libs",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -9,11 +8,5 @@
           "features": ["openssl"],
           "default-features": false
         }
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/lib/vcpkg_config_android/vcpkg.json b/lib/vcpkg_config_android/vcpkg.json
deleted file mode 100644
index 3741e30d3dd..00000000000
--- a/lib/vcpkg_config_android/vcpkg.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "boinc-libs",
-    "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
-    "dependencies":
-    [
-        "openssl"
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
-}