Add android SDK into the installer bundle

Author: hyp

platforms/Windows/bundle/installer.wixproj

@@ -8,6 +8,7 @@
       $(DefineConstants);
       INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
+      INCLUDE_ANDROID_SDKS=$(INCLUDE_ANDROID_SDKS);
     </DefineConstants>
   </PropertyGroup>
 
@@ -31,4 +32,8 @@
   <ItemGroup Condition=" '$(INCLUDE_ARM64_SDK)' != '' ">
     <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(INCLUDE_ANDROID_SDKS)' != '' ">
+    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_sdk_aarch64" />
+  </ItemGroup>
 </Project>

platforms/Windows/bundle/installer.wxs

@@ -38,6 +38,7 @@
     <Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallAndroidSdks" bal:Overridable="yes" Persisted="yes" Value="1" />
 
     <!--
     For the online bundle, we need to provide a download URL for each package and its .cabs.
@@ -119,6 +120,15 @@
           <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
         </MsiPackage>
       <?endif?>
+
+      <?if $(INCLUDE_ANDROID_SDKS) == true ?>
+        <MsiPackage
+          SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
+          InstallCondition="OptionsInstallAndroidSdks"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
      </Chain>
   </Bundle>
 </Wix>

platforms/Windows/bundle/theme.xml

@@ -67,6 +67,7 @@
             <Checkbox Name="OptionsInstallRedistArm64" X="194" Y="285" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkArm64">#(loc.Redist_arm64)</Checkbox>
             <Checkbox Name="OptionsInstallSdkX86" X="176" Y="303" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
             <Checkbox Name="OptionsInstallRedistX86" X="194" Y="321" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkX86">#(loc.Redist_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKs" X="176" Y="338" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidSdks">#(loc.Android_Skds)</Checkbox>
 
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>

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

@@ -24,6 +24,7 @@
   <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_Skds" Value="Swift Android SDKs" />
 
   <String Id="Caption" Value="[WixBundleName] Setup" />
   <String Id="Title" Value="[WixBundleName]" />