Test android openssl fix

BOINC · May 20, 2022 · 6fa4797 · 6fa4797
1 parent df1458f
commit 6fa4797
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 33 deletions.
diff --git 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/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
@@ -1,19 +1,12 @@
 {
     "name": "boinc-client",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
           "name": "curl",
           "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
@@ -1,19 +1,12 @@
 {
     "name": "boinc-libs",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
           "name": "curl",
           "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
@@ -1,15 +1,8 @@
 {
     "name": "boinc-libs",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         "openssl"
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }