Skip to content

Commit a82805c

Browse files
compnerdcompnerd
committed
WiX: adjust the android platform packaging
- Correct the case for the XCTest inclusion check - Correct indentation for DS2 inclusion - Correct feature names for architecture support - Correct media IDs for certain architectures - Correct directories for certain files - Correct names for certain directories
1 parent 500210f commit a82805c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎platforms/Windows/platforms/android/android.wxs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
</Component>
201201
</ComponentGroup>
202202
<?endif?>
203-
<?if $(IncludeX64) = true?>
203+
<?if $(IncludeX64) = True?>
204204
<ComponentGroup Id="XCTest.x64">
205205
<Component Directory="XCTest.swiftmodule" DiskId="4">
206206
<File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
@@ -464,10 +464,10 @@
464464
<File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
465465
</Component>
466466

467-
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="3">
467+
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
468468
<File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
469469
</Component>
470-
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="3">
470+
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
471471
<File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDispatch.so" />
472472
</Component>
473473
</ComponentGroup>
@@ -559,7 +559,7 @@
559559
<File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
560560
</Component>
561561

562-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="3">
562+
<Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
563563
<File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Builtin_float.so" />
564564
</Component>
565565
</ComponentGroup>
@@ -576,7 +576,7 @@
576576
<File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
577577
</Component>
578578

579-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="4">
579+
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
580580
<File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Builtin_float.so" />
581581
</Component>
582582
</ComponentGroup>
@@ -593,7 +593,7 @@
593593
<File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftmodule" />
594594
</Component>
595595

596-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="5">
596+
<Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
597597
<File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Builtin_float.so" />
598598
</Component>
599599
</ComponentGroup>
@@ -1083,14 +1083,14 @@
10831083
<?if $(IncludeX64) = True?>
10841084
<ComponentGroup Id="Cxx.x64" Directory="Cxx.swiftmodule">
10851085
<Component DiskId="4">
1086-
<File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
1086+
<File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
10871087
</Component>
10881088
<Component DiskId="4">
1089-
<File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
1089+
<File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
10901090
</Component>
10911091

10921092
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
1093-
<File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCxx.a" />
1093+
<File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCxx.a" />
10941094
</Component>
10951095
</ComponentGroup>
10961096
<?endif?>
@@ -1363,7 +1363,7 @@
13631363
<File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftmodule" />
13641364
</Component>
13651365

1366-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="5">
1366+
<Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
13671367
<File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationEssentials.so" />
13681368
</Component>
13691369
</ComponentGroup>
@@ -1648,7 +1648,7 @@
16481648
<File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
16491649
</Component>
16501650

1651-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="4">
1651+
<Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
16521652
<File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_math.so" />
16531653
</Component>
16541654
</ComponentGroup>
@@ -1665,7 +1665,7 @@
16651665
<File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftmodule" />
16661666
</Component>
16671667

1668-
<Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="5">
1668+
<Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
16691669
<File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_math.so" />
16701670
</Component>
16711671
</ComponentGroup>
@@ -2146,7 +2146,7 @@
21462146
<?endif?>
21472147

21482148
<?if $(IncludeARM) = True?>
2149-
<Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_armv7)">
2149+
<Feature Id="armv7" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_armv7)">
21502150
<Level Condition="InstallARMSDK = 0" Value="0" />
21512151

21522152
<ComponentGroupRef Id="XCTest.arm" />
@@ -2191,7 +2191,7 @@
21912191
<?endif?>
21922192

21932193
<?if $(IncludeX64) = True?>
2194-
<Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_amd64)">
2194+
<Feature Id="amd64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_amd64)">
21952195
<Level Condition="InstallX64SDK = 0" Value="0" />
21962196

21972197
<ComponentGroupRef Id="XCTest.x64" />
@@ -2236,7 +2236,7 @@
22362236
<?endif?>
22372237

22382238
<?if $(IncludeX86) = True?>
2239-
<Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_x86)">
2239+
<Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_x86)">
22402240
<Level Condition="InstallX86SDK = 0" Value="0" />
22412241

22422242
<ComponentGroupRef Id="XCTest.x86" />
@@ -2274,7 +2274,7 @@
22742274

22752275
<ComponentGroupRef Id="Registrar.x86" />
22762276

2277-
<?if $(ANDROID_INCLUDE_DS2) = True?>
2277+
<?if $(ANDROID_INCLUDE_DS2) = True?>
22782278
<ComponentGroupRef Id="ds2.x86" />
22792279
<?endif?>
22802280
</Feature>

0 commit comments

Comments
 (0)