support multiple arches for android MSI

Author: hyp

platforms/Windows/SideBySideUpgradeStrategy.props

@@ -26,6 +26,9 @@
     <SdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{762D10FE-EBE5-4554-BB78-FB13A4A487E3}</SdkUpgradeCode>
     <SdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{9749D9E6-E860-4FF6-9E8A-525270F471A3}</SdkUpgradeCode>
     <AndroidSdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'aarch64' ">{485f88f4-9342-48cb-853a-12da885a5818}</AndroidSdkUpgradeCode>
+    <AndroidSdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86_64' ">{0838ee60-5d4a-4832-b844-73dad6eb1cc1}</AndroidSdkUpgradeCode>
+    <AndroidSdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'armv7' ">{1269a926-3528-4ab7-b4d6-386d5c3f903a}</AndroidSdkUpgradeCode>
+    <AndroidSdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'i686' ">{d889349b-0000-4600-a04a-93602525d5db}</AndroidSdkUpgradeCode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">

platforms/Windows/android_sdk/android_sdk.wxs

@@ -4,6 +4,15 @@
   <?if $(ProductArchitecture) = "aarch64"?>
     <?define ArchArchDir = "aarch64"?>
     <?define ArchTriple = "aarch64-unknown-linux-android"?>
+  <?elseif $(ProductArchitecture) = "x86_64"?>
+    <?define ArchArchDir = "x86_64"?>
+    <?define ArchTriple = "x86_64-unknown-linux-android"?>
+  <?elseif $(ProductArchitecture) = "armv7"?>
+    <?define ArchArchDir = "armv7"?>
+    <?define ArchTriple = "armv7-unknown-linux-android"?>
+  <?elseif $(ProductArchitecture) = "i686"?>
+    <?define ArchArchDir = "i686"?>
+    <?define ArchTriple = "i686-unknown-linux-android"?>
   <?endif?>
 
   <Package

platforms/Windows/shared/swift.en-us.wxl

@@ -16,7 +16,10 @@
   <String Id="Sdk_ProductName_arm64" Value="Swift Windows SDK (ARM64)" />
   <String Id="Sdk_ProductName_amd64" Value="Swift Windows SDK (AMD64)" />
   <String Id="Sdk_ProductName_x86" Value="Swift Windows SDK (X86)" />
-  <String Id="AndroidSdk_ProductName_aarch64" Value="Swift Android SDK (Aarch64)" />
+  <String Id="AndroidSdk_ProductName_aarch64" Value="Swift Android SDK (Arm64)" />
+  <String Id="AndroidSdk_ProductName_x86_64" Value="Swift Android SDK (AMD64)" />
+  <String Id="AndroidSdk_ProductName_armv7" Value="Swift Android SDK (Arm)" />
+  <String Id="AndroidSdk_ProductName_i686" Value="Swift Android SDK (X86)" />
   <String Id="BundleName" Value="Swift Developer Toolkit" />
   <String Id="ManufacturerName" Value="swift.org" />