diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 4de5c5b2a29532..5c0085674853ee 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -470,14 +470,6 @@ function(vcpkg_configure_make) endif() endif() - # Android - cross-compiling support - if(VCPKG_TARGET_IS_ANDROID) - if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) - set(arg_BUILD_TRIPLET "--host=${VCPKG_MAKE_BUILD_TRIPLET}") - debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") - endif() - endif() - # Cleanup previous build dirs file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" diff --git a/triplets/community/arm-android.cmake b/triplets/community/arm-android.cmake index d21485743eb8f7..feb8f186b799aa 100644 --- a/triplets/community/arm-android.cmake +++ b/triplets/community/arm-android.cmake @@ -2,4 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET armv7a-linux-androideabi) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") diff --git a/triplets/community/arm64-android.cmake b/triplets/community/arm64-android.cmake index 0789e428ca410b..46ad5f166aeb48 100644 --- a/triplets/community/arm64-android.cmake +++ b/triplets/community/arm64-android.cmake @@ -2,4 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET aarch64-linux-android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") diff --git a/triplets/community/x64-android.cmake b/triplets/community/x64-android.cmake index 2929063eef39a0..7ef27c2b80873b 100644 --- a/triplets/community/x64-android.cmake +++ b/triplets/community/x64-android.cmake @@ -2,4 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET x86_64-linux-android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") diff --git a/triplets/community/x86-android.cmake b/triplets/community/x86-android.cmake index 732771b5b10103..f909598cb3fc95 100644 --- a/triplets/community/x86-android.cmake +++ b/triplets/community/x86-android.cmake @@ -2,4 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) -set(VCPKG_MAKE_BUILD_TRIPLET i686-linux-android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android")