Use one set of strings for the android SDK strings

Author: hyp

platforms/Windows/android_sdk/android_sdk.wxs

@@ -2,23 +2,27 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <?if $(ProductArchitecture) = "aarch64"?>
+    <?define ArchName = "arm64"?>
     <?define ArchArchDir = "aarch64"?>
     <?define ArchTriple = "aarch64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "x86_64"?>
+    <?define ArchName = "amd64"?>
     <?define ArchArchDir = "x86_64"?>
     <?define ArchTriple = "x86_64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "armv7"?>
+    <?define ArchName = "arm"?>
     <?define ArchArchDir = "armv7"?>
     <?define ArchTriple = "armv7-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "i686"?>
+    <?define ArchName = "x86"?>
     <?define ArchArchDir = "i686"?>
     <?define ArchTriple = "i686-unknown-linux-android"?>
   <?endif?>
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.AndroidSdk_ProductName_$(ProductArchitecture))"
+      Name="!(loc.Android_Sdk_$(ArchName))"
       UpgradeCode="$(AndroidSDKUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
@@ -487,7 +491,7 @@
     </ComponentGroup>
 
     <!-- Features -->
-    <Feature Id="AndroidSDK" AllowAbsent="no" Title="!(loc.AndroidSdk_ProductName_$(ProductArchitecture))">
+    <Feature Id="AndroidSDK" AllowAbsent="no" Title="!(loc.Android_Sdk_$(ArchName))">
       <ComponentGroupRef Id="XCTest" />
       <ComponentGroupRef Id="SwiftRemoteMirror" />
       <ComponentGroupRef Id="BlocksRuntime" />

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

@@ -16,21 +16,17 @@
   <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 (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="Android_Sdk_arm64" Value="Swift Android SDK (ARM64)" />
+  <String Id="Android_Sdk_amd64" Value="Swift Android SDK (AMD64)" />
+  <String Id="Android_Sdk_arm" Value="Swift Android SDK (ARM)" />
+  <String Id="Android_Sdk_x86" Value="Swift Android SDK (X86)" />
   <String Id="BundleName" Value="Swift Developer Toolkit" />
   <String Id="ManufacturerName" Value="swift.org" />
 
   <String Id="OptionsFeaturesLabel" Value="Feature Selection" />
   <String Id="Redist_arm64" Value="Swift Windows Redistributable (ARM64)" />
   <String Id="Redist_amd64" Value="Swift Windows Redistributable (AMD64)" />
   <String Id="Redist_x86" Value="Swift Windows Redistributable (X86)" />
-  <String Id="Android_Sdk_arm64" Value="Swift Android SDK (ARM64)" />
-  <String Id="Android_Sdk_amd64" Value="Swift Android SDK (AMD64)" />
-  <String Id="Android_Sdk_arm" Value="Swift Android SDK (ARM)" />
-  <String Id="Android_Sdk_x86" Value="Swift Android SDK (X86)" />
 
   <String Id="Caption" Value="[WixBundleName] Setup" />
   <String Id="Title" Value="[WixBundleName]" />