Include the Android ds2 binaries in the Swift toolchain Windows installer.
Overview
Explicitly sets ANDROID_INCLUDE_DS2=true when building the installer so the ds2 Android binaries get included in the installer.
Remove an extra "Android" from the download path to match the expected file location in the .wxs file.
Validation
Successful swift-toolchain build with this change here.
Downloaded the Android SDK installer artifacts sdk-android-armv7-msi, sdk-android-x86_64-msi, sdk-android-arm64-msi, and sdk-android-i686-msi and verified the ds2 binary is present using Windows MSI viewer.
Purpose
Include the Android ds2 binaries in the Swift toolchain Windows installer.
Overview
ANDROID_INCLUDE_DS2=truewhen building the installer so the ds2 Android binaries get included in the installer.Validation
Successful swift-toolchain build with this change here.
Downloaded the Android SDK installer artifacts
sdk-android-armv7-msi,sdk-android-x86_64-msi,sdk-android-arm64-msi, andsdk-android-i686-msiand verified theds2binary is present using Windows MSI viewer.