Skip to content

Commit ec6c2ea

Browse files
committed
Add android SDK installer support
1 parent cc57ac7 commit ec6c2ea

File tree

4 files changed

+543
-0
lines changed

4 files changed

+543
-0
lines changed

platforms/Windows/SideBySideUpgradeStrategy.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<SdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{443F4D7F-38F3-47C8-9BEE-37FEB01D13C8}</SdkUpgradeCode>
2626
<SdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{762D10FE-EBE5-4554-BB78-FB13A4A487E3}</SdkUpgradeCode>
2727
<SdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{9749D9E6-E860-4FF6-9E8A-525270F471A3}</SdkUpgradeCode>
28+
<AndroidSdkUpgradeCode Condition=" '$(ProductArchitecture)' == 'aarch64' ">{485f88f4-9342-48cb-853a-12da885a5818}</AndroidSdkUpgradeCode>
2829
</PropertyGroup>
2930

3031
<PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">
@@ -53,6 +54,7 @@
5354
IdeUpgradeCode=$(IdeUpgradeCode);
5455
RtlUpgradeCode=$(RtlUpgradeCode);
5556
SdkUpgradeCode=$(SdkUpgradeCode);
57+
AndroidSdkUpgradeCode=$(AndroidSdkUpgradeCode);
5658
</DefineConstants>
5759
</PropertyGroup>
5860
</Project>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="WixToolset.Sdk/4.0.1">
2+
<PropertyGroup>
3+
<OutputName>android_sdk.$(ProductArchitecture)</OutputName>
4+
<Platform>x86</Platform>
5+
6+
<SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>
7+
8+
<DefineConstants>
9+
$(DefineConstants);
10+
SwiftShimsPath=$(SwiftShimsPath);
11+
</DefineConstants>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="WixToolset.Heat" Version="4.0.1" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<HarvestDirectory Include="$(SwiftShimsPath)">
20+
<ComponentGroupName>SwiftShims</ComponentGroupName>
21+
<DirectoryRefId>AndroidSDK_usr_lib_swift_shims</DirectoryRefId>
22+
<PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
23+
<SuppressCom>true</SuppressCom>
24+
<SuppressRegistry>true</SuppressRegistry>
25+
<SuppressRootDirectory>true</SuppressRootDirectory>
26+
</HarvestDirectory>
27+
</ItemGroup>
28+
</Project>

0 commit comments

Comments
 (0)