From fe305d92adce3b751f011907400efbf7e0e4ff4c Mon Sep 17 00:00:00 2001
From: Andrew Rogers <andrurogerz@gmail.com>
Date: Thu, 22 Aug 2024 10:04:53 -0700
Subject: [PATCH 1/2] [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.
---
 platforms/Windows/android_sdk/android_sdk.wixproj |  1 +
 platforms/Windows/android_sdk/android_sdk.wxs     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/platforms/Windows/android_sdk/android_sdk.wixproj b/platforms/Windows/android_sdk/android_sdk.wixproj
index 97eb36ff..5d5bd4fc 100644
--- a/platforms/Windows/android_sdk/android_sdk.wixproj
+++ b/platforms/Windows/android_sdk/android_sdk.wixproj
@@ -7,6 +7,7 @@
 
     <DefineConstants>
       $(DefineConstants);
+      ANDROID_INCLUDE_DS2=$(ANDROID_INCLUDE_DS2);
       SwiftShimsPath=$(SwiftShimsPath);
     </DefineConstants>
   </PropertyGroup>
diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs
index 1da8c614..49ce2438 100644
--- a/platforms/Windows/android_sdk/android_sdk.wxs
+++ b/platforms/Windows/android_sdk/android_sdk.wxs
@@ -79,6 +79,9 @@
                 </Directory>
               </Directory>
             </Directory>
+            <Directory Name="$(ArchTriple)">
+              <Directory Id="Android_Library_ARCH_bin" Name="bin" />
+            </Directory>
           </Directory>
           <Directory Name="SDKs">
             <!-- Android.sdk -->
@@ -156,6 +159,14 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="DS2">
+      <?if $(ANDROID_INCLUDE_DS2) == true ?>
+        <Component Directory="Android_Library_ARCH_bin">
+          <File Source="$(PLATFORM_ROOT)\Developer\Library\$(ArchTriple)\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 +1294,7 @@
       <ComponentGroupRef Id="Registrar" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="DS2" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>

From 3d879e606272208cd17d41a1775a80ffcfa79dff Mon Sep 17 00:00:00 2001
From: Andrew Rogers <andrurogerz@gmail.com>
Date: Wed, 4 Sep 2024 12:58:13 -0700
Subject: [PATCH 2/2] [android] ensure the armv7 ds2 executable is in the right
 location

---
 platforms/Windows/android_sdk/android_sdk.wxs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/android_sdk/android_sdk.wxs
index 49ce2438..9f1df9c8 100644
--- a/platforms/Windows/android_sdk/android_sdk.wxs
+++ b/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,7 +92,7 @@
                 </Directory>
               </Directory>
             </Directory>
-            <Directory Name="$(ArchTriple)">
+            <Directory Name="$(ArchTripleDir)">
               <Directory Id="Android_Library_ARCH_bin" Name="bin" />
             </Directory>
           </Directory>
@@ -162,7 +175,7 @@
     <ComponentGroup Id="DS2">
       <?if $(ANDROID_INCLUDE_DS2) == true ?>
         <Component Directory="Android_Library_ARCH_bin">
-          <File Source="$(PLATFORM_ROOT)\Developer\Library\$(ArchTriple)\bin\ds2" />
+          <File Source="$(PLATFORM_ROOT)\Developer\Library\$(ArchTripleDir)\bin\ds2" />
         </Component>
       <?endif?>
     </ComponentGroup>