[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android

docs/maintainers/vcpkg_common_definitions.md

@@ -2,7 +2,7 @@
 
 The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_common_definitions.md).
 
-This file defines the following variabls which are commonly needed or used in portfiles:
+This file defines the following variables which are commonly needed or used in portfiles:
 
 ```cmake
 VCPKG_TARGET_IS_<target>                 with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if <target>

docs/maintainers/vcpkg_fixup_pkgconfig.md

@@ -2,7 +2,7 @@
 
 The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_pkgconfig.md).
 
-Fix common paths in *.pc files and make everything relativ to $(prefix)
+Fix common paths in *.pc files and make everything relative to $(prefix)
 
 ## Usage
 ```cmake

ports/aws-sdk-cpp/portfile.cmake

@@ -17,8 +17,23 @@ set(BUILD_ONLY core)
 
 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
 
+set(EXTRA_ARGS)
 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
     set(rpath "@loader_path")
+elseif (VCPKG_TARGET_IS_ANDROID)
+    set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
+            "-DGIT_EXECUTABLE=--invalid-git-executable--"
+            "-DGIT_FOUND=TRUE"
+            "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}"
+            "-DANDROID_BUILD_ZLIB=FALSE"
+            "-DANDROID_BUILD_CURL=FALSE"
+            "-DANDROID_BUILD_OPENSSL=FALSE"
+            "-DENABLE_HW_OPTIMIZATION=OFF"
+            "-DCURL_HAS_H2_EXITCODE=0"
+            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
+            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
+            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
+            )
 else()
     set(rpath "\$ORIGIN")
 endif()
@@ -27,6 +42,7 @@ vcpkg_configure_cmake(
     DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
+        ${EXTRA_ARGS}
         -DENABLE_UNITY_BUILD=ON
         -DENABLE_TESTING=OFF
         -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}

ports/aws-sdk-cpp/vcpkg.in.json

@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 7,
+  "port-version": 8,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [

ports/aws-sdk-cpp/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 7,
+  "port-version": 8,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [

ports/curl/0009_fix_openssl_config.patch

@@ -1,12 +1,27 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a13333..5a7ece0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -361,6 +361,7 @@ if(CMAKE_USE_SECTRANSP)
-   list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}")
- endif()
-
-+set(USE_OPENSSL OFF)
- if(CMAKE_USE_OPENSSL)
-   find_package(OpenSSL REQUIRED)
-   set(SSL_ENABLED ON)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	(revision e052859759b34d0e05ce0f17244873e5cd7b457b)
++++ b/CMakeLists.txt	(date 1617452756163)
+@@ -383,14 +383,21 @@
+ endif()
+
+ if(CMAKE_USE_OPENSSL)
+-  find_package(OpenSSL REQUIRED)
++  if(ANDROID)
++    message(WARNING "Setting paths manually (instead of using pkg-config) since this is an android build" )
++
++    set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY})
++    include_directories("${OPENSSL_INCLUDE}")
++  else()
++    find_package(OpenSSL REQUIRED)
++  endif()
+   set(SSL_ENABLED ON)
+   set(USE_OPENSSL ON)
+
+   # Depend on OpenSSL via imported targets if supported by the running
+   # version of CMake.  This allows our dependents to get our dependencies
+   # transitively.
+-  if(NOT CMAKE_VERSION VERSION_LESS 3.4)
++  if(NOT CMAKE_VERSION VERSION_LESS 3.4 AND NOT ANDROID)
+     list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
+   else()
+     list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})

ports/curl/CONTROL

@@ -1,5 +1,5 @@
 Source: curl
-Port-Version: 3
+Port-Version: 4
 Version: 7.74.0
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl
@@ -56,4 +56,4 @@ Description: brotli support (brotli)
 
 Feature: idn2
 Build-Depends: libidn2
-Description: idn2 support (libidn2)
+Description: idn2 support (libidn2)

ports/curl/CurlAndroidCrossCompile.cmake

@@ -0,0 +1,16 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0.
+#
+
+SET( HAVE_GLIBC_STRERROR_R 1 CACHE STRING "Result from TRY_RUN" FORCE)
+SET( HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+SET( HAVE_POSIX_STRERROR_R 0 CACHE STRING "Result from TRY_RUN" FORCE)
+SET( HAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+SET( HAVE_POLL_FINE_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE )
+SET( HAVE_POLL_FINE_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+SET( CURL_HAS_H2_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE )
+SET( CURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+SET( CURL_HAS_TLS_PROXY_EXITCODE 0 CACHE STRING "Result from TRY_RUN" FORCE )
+SET( CURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+SET( OPENSSL_CRYPTO_LIBRARY crypto CACHE STRING "Set crypto" FORCE )
+SET( OPENSSL_SSL_LIBRARY ssl CACHE STRING "Set ssl" FORCE )

ports/curl/portfile.cmake

@@ -43,7 +43,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     schannel    CMAKE_USE_SCHANNEL
     sectransp   CMAKE_USE_SECTRANSP
     idn2        CMAKE_USE_IDN2
-    
+
     INVERTED_FEATURES
     non-http HTTP_ONLY
 )
@@ -64,18 +64,40 @@ if(VCPKG_TARGET_IS_UWP)
     )
 endif()
 
+if(VCPKG_TARGET_IS_ANDROID)
+    set(ADDITIONAL_SCRIPTS -C "${CMAKE_CURRENT_LIST_DIR}/CurlAndroidCrossCompile.cmake")
+
+    set(EXTRA_ARGS -DOPENSSL_INCLUDE="${CURRENT_INSTALLED_DIR}/include")
+
+    set(EXTRA_ARGS_DEBUG
+            -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libssl.so"
+            -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.so"
+            )
+
+    set(EXTRA_ARGS_RELEASE
+            -DOPENSSL_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libssl.so"
+            -DCRYPT_LIBRARY="${CURRENT_INSTALLED_DIR}/lib/libcrypto.so"
+            )
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
         ${UWP_OPTIONS}
+        ${ADDITIONAL_SCRIPTS}
+        ${EXTRA_ARGS}
         ${SECTRANSP_OPTIONS}
         -DBUILD_TESTING=OFF
         -DENABLE_MANUAL=OFF
         -DCURL_STATICLIB=${CURL_STATICLIB}
         -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
         -DENABLE_DEBUG=ON
         -DCURL_CA_FALLBACK=ON
+    OPTIONS_DEBUG
+        ${EXTRA_ARGS_DEBUG}
+    OPTIONS_RELEASE
+        ${EXTRA_ARGS_RELEASE}
 )
 
 vcpkg_install_cmake()
@@ -127,22 +149,22 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.lib" "-lssh2")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/cares.lib" "-lcares")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlicommon.lib" "-lbrotlicommon")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec")			
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/brotlidec.lib" "-lbrotlidec")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "-lpthreadVC3d")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "")		
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -loptimized" "")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "")	
-	
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc " -ldebug" "")
+
     elseif(VCPKG_TARGET_IS_LINUX)
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d")    
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "-lcurl" "-lcurl-d")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.a" "-lcrypto")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedtls.a" "-lmbedtls")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedx509.a" "-lmbedx509")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libmbedcrypto.a" "-lmbedcrypto")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libnghttp2.a" "-lnghttp2")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssh2.a" "-lssh2")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcares.a" "-lcares") 		
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libcares.a" "-lcares")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "-lz")
     endif()
     file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
@@ -162,11 +184,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.lib" "-lssh2")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/cares.lib" "-lcares")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlicommon.lib" "-lbrotlicommon")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec")			
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/brotlidec.lib" "-lbrotlidec")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "-lpthreadVC3")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "")		
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -loptimized" "")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "")		
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc " -ldebug" "")
     elseif(VCPKG_TARGET_IS_LINUX)
         #vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "-lcurl" "-lcurl")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssl.a" "-lssl")
@@ -176,15 +198,17 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libmbedcrypto.a" "-lmbedcrypto")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libnghttp2.a" "-lnghttp2")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libssh2.a" "-lssh2")
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcares.a" "-lcares")        
+        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libcares.a" "-lcares")
         vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc "${CURRENT_INSTALLED_DIR}/lib/libz.a" "-lz")
     endif()
 	file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
 endif()
-if(VCPKG_TARGET_IS_WINDOWS)	
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_fixup_pkgconfig()
 elseif(VCPKG_TARGET_IS_LINUX)
     vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread dl c)
+elseif(VCPKG_TARGET_IS_ANDROID)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

ports/libssh/0002-mingw_for_Android.patch

@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt	(revision 0cceefd49d4d397eb21bd36e314ac87739da51ff)
++++ b/src/CMakeLists.txt	(date 1617870624653)
+@@ -361,7 +361,7 @@
+   set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+ endif (WITH_VISIBILITY_HIDDEN)
+
+-if (MINGW)
++if (MINGW AND NOT ANDROID)
+     set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup")
+     set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE")
+ endif ()

ports/libssh/CONTROL

@@ -1,6 +1,6 @@
 Source: libssh
 Version: 0.9.5
-Port-Version: 2
+Port-Version: 3
 Homepage: https://www.libssh.org/
 Build-Depends: libssh[core,mbedtls] (android)
 Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side

ports/libssh/portfile.cmake

@@ -7,6 +7,7 @@ vcpkg_from_git(
     SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
     PATCHES
         0001-export-pkgconfig-file.patch
+        0002-mingw_for_Android.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

ports/openssl/CONTROL

@@ -1,4 +1,5 @@
 Source: openssl
 Version: 1.1.1j
+Port-Version: 1
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

ports/openssl/unix/CMakeLists.txt

@@ -106,7 +106,7 @@ if(BUILD_SHARED_LIBS)
     if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
         set(LIB_EXT dylib)
         set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT})
-    elseif(MINGW)
+    elseif(VCPKG_TARGET_IS_MINGW)
         string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}")
         set(BIN_EXT dll)
         set(LIB_EXT dll.a)

ports/zlib/0002-android-build-mingw.patch

@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	(date 1618364429263)
++++ b/CMakeLists.txt	(date 1618364429263)
+@@ -170,7 +170,7 @@
+ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+-if(MINGW)
++if(MINGW AND NOT ANDROID)
+     # This gets us DLL resource information when compiling on MinGW.
+     if(NOT CMAKE_RC_COMPILER)
+         set(CMAKE_RC_COMPILER windres.exe)
+@@ -186,7 +186,7 @@
+     if(BUILD_SHARED_LIBS)
+         set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+     endif()
+-endif(MINGW)
++endif(MINGW AND NOT ANDROID)
+
+ add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)

ports/zlib/CONTROL

@@ -1,5 +1,5 @@
 Source: zlib
 Version: 1.2.11
-Port-Version: 9
+Port-Version: 10
 Homepage: https://www.zlib.net/
 Description: A compression library

ports/zlib/portfile.cmake

@@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex(
         "cmake_dont_build_more_than_needed.patch"
         "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch"
         "add_debug_postfix_on_mingw.patch"
+        "0002-android-build-mingw.patch"
 )
 
 # This is generated during the cmake build

scripts/cmake/vcpkg_common_definitions.cmake

@@ -1,7 +1,7 @@
 #[===[.md:
 # vcpkg_common_definitions
 
-This file defines the following variabls which are commonly needed or used in portfiles:
+This file defines the following variables which are commonly needed or used in portfiles:
 
 ```cmake
 VCPKG_TARGET_IS_<target>                 with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if <target>

scripts/cmake/vcpkg_fixup_pkgconfig.cmake

@@ -1,7 +1,7 @@
 #[===[.md:
 # vcpkg_fixup_pkgconfig
 
-Fix common paths in *.pc files and make everything relativ to $(prefix)
+Fix common paths in *.pc files and make everything relative to $(prefix)
 
 ## Usage
 ```cmake

versions/a-/aws-sdk-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e1cf5cdb2c16125d532b8281d6901839f11a25f5",
+      "version": "1.8.126",
+      "port-version": 8
+    },
     {
       "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db",
       "version": "1.8.126",