Skip to content

Commit 4137718

Browse files
committed
WiX: package up Synchronisation on Android ARMv7
swiftlang/swift#74186 has been marked resolved. Address the FIXME to enable packaging the module again.
1 parent 8ed0a4d commit 4137718

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

platforms/Windows/android_sdk/android_sdk.wxs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,6 @@
470470
</Component>
471471
</ComponentGroup>
472472

473-
<!-- FIXME: re-enable once https://github.com/apple/swift/issues/74186 is fixed -->
474-
<?if $(ProductArchitecture) != "armv7"?>
475473
<ComponentGroup Id="Synchronization" Directory="Synchronization.swiftmodule">
476474
<Component>
477475
<File Source="$(SDK_ROOT)\usr\lib\swift\android\Synchronization.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -486,7 +484,6 @@
486484
<File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftSynchronization.so" />
487485
</Component>
488486
</ComponentGroup>
489-
<?endif?>
490487

491488
<ComponentGroup Id="apinotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
492489
<Component>
@@ -544,10 +541,7 @@
544541
<ComponentGroupRef Id="RegexBuilder" />
545542
<ComponentGroupRef Id="Swift" />
546543
<ComponentGroupRef Id="SwiftOnoneSupport" />
547-
<!-- FIXME: re-enable once https://github.com/apple/swift/issues/74186 is fixed -->
548-
<?if $(ProductArchitecture) != "armv7"?>
549544
<ComponentGroupRef Id="Synchronization" />
550-
<?endif?>
551545
<ComponentGroupRef Id="apinotes" />
552546
<ComponentGroupRef Id="libcxxshim" />
553547
<ComponentGroupRef Id="Registrar" />

0 commit comments

Comments
 (0)