[android] optionally include DS2 in Android SDK

Conditionally include DS2 in the Android SDK when building the MSI with
`-p:ANDROID_INCLUDE_DS2=true` passed to `msbuild`. Has no impact on the
generated installer if this property is not set.

Author: andrurogerz

platforms/Windows/android_sdk/android_sdk.wixproj

@@ -7,6 +7,7 @@
 
     <DefineConstants>
       $(DefineConstants);
+      ANDROID_INCLUDE_DS2=$(ANDROID_INCLUDE_DS2);
       SwiftShimsPath=$(SwiftShimsPath);
     </DefineConstants>
   </PropertyGroup>

platforms/Windows/android_sdk/android_sdk.wxs

@@ -5,18 +5,31 @@
     <?define ArchName = "arm64"?>
     <?define ArchArchDir = "aarch64"?>
     <?define ArchTriple = "aarch64-unknown-linux-android"?>
+    <?define ArchTripleDir = "aarch64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "x86_64"?>
     <?define ArchName = "amd64"?>
     <?define ArchArchDir = "x86_64"?>
     <?define ArchTriple = "x86_64-unknown-linux-android"?>
+    <?define ArchTripleDir = "x86_64-unknown-linux-android"?>
   <?elseif $(ProductArchitecture) = "armv7"?>
     <?define ArchName = "arm"?>
     <?define ArchArchDir = "armv7"?>
+    <!--
+      The Swift compiler outputs Android armv7 .swiftdoc, .swiftmodule, and
+      .swiftinterface files with the name armv7-unknown-linux-android. Since the
+      correct triple is armv7-unknown-linux-androideabi, define two constants to
+      deal with the inconsistency.
+
+      TODO: consider updating Swift compiler to output file names matching the
+      correct triple.
+    -->
     <?define ArchTriple = "armv7-unknown-linux-android"?>
+    <?define ArchTripleDir = "armv7-unknown-linux-androideabi"?>
   <?elseif $(ProductArchitecture) = "i686"?>
     <?define ArchName = "x86"?>
     <?define ArchArchDir = "i686"?>
     <?define ArchTriple = "i686-unknown-linux-android"?>
+    <?define ArchTripleDir = "i686-unknown-linux-android"?>
   <?endif?>
 
   <Package
@@ -79,6 +92,9 @@
                 </Directory>
               </Directory>
             </Directory>
+            <Directory Name="$(ArchTripleDir)">
+              <Directory Id="Android_Library_ARCH_bin" Name="bin" />
+            </Directory>
           </Directory>
           <Directory Name="SDKs">
             <!-- Android.sdk -->
@@ -156,6 +172,14 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="DS2">
+      <?if $(ANDROID_INCLUDE_DS2) == true ?>
+        <Component Directory="Android_Library_ARCH_bin">
+          <File Source="$(PLATFORM_ROOT)\Developer\Library\$(ArchTripleDir)\bin\ds2" />
+        </Component>
+      <?endif?>
+    </ComponentGroup>
+
     <ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
       <Component>
         <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -1283,6 +1307,7 @@
       <ComponentGroupRef Id="Registrar" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="DS2" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>