Skip to content

WiX: package up Synchronisation on Android ARMv7 #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2024
Merged

WiX: package up Synchronisation on Android ARMv7 #311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions platforms/Windows/android_sdk/android_sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,6 @@
</Component>
</ComponentGroup>

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

<ComponentGroup Id="apinotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
<Component>
Expand Down Expand Up @@ -544,10 +541,7 @@
<ComponentGroupRef Id="RegexBuilder" />
<ComponentGroupRef Id="Swift" />
<ComponentGroupRef Id="SwiftOnoneSupport" />
<!-- FIXME: re-enable once https://github.com/apple/swift/issues/74186 is fixed -->
<?if $(ProductArchitecture) != "armv7"?>
<ComponentGroupRef Id="Synchronization" />
<?endif?>
<ComponentGroupRef Id="apinotes" />
<ComponentGroupRef Id="libcxxshim" />
<ComponentGroupRef Id="Registrar" />
Expand Down