Skip to content

[android] Disable a couple Reflection tests and fix an install path #82620

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 2, 2025
Merged

[android] Disable a couple Reflection tests and fix an install path #82620

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cmake/modules/SwiftConfigureSDK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function(_report_sdk prefix)
endforeach()
elseif("${prefix}" STREQUAL "ANDROID")
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
message(STATUS " NDK: ${SWIFT_ANDROID_NDK_PATH}")
endif()
if(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
message(STATUS " Sysroot: ${SWIFT_ANDROID_NATIVE_SYSROOT}")
Expand Down
1 change: 1 addition & 0 deletions test/Reflection/conformance_descriptors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//
// Temporarily disable on AArch64 Linux (rdar://88451721)
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
// XFAIL: OS=linux-android
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment, do you have the failure handy? The radar is for a different failure mode, but I can try to confirm that it's the same issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here


// rdar://100558042
// UNSUPPORTED: CPU=arm64e
Expand Down
1 change: 1 addition & 0 deletions test/Reflection/typeref_decoding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// FIXME: rdar://127796117
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
// XFAIL: OS=linux-android
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have the failure handy? I don't know if I'm allowed to copy the failure from the radar, but I can confirm if it's the same as the issue making linux-gnu aarch64 unsupported. If they are the same issue, it's probably worth keeping everything on the same line so that they get cleaned up together and I can make a note in the radar.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adrian-prantl says both are passing on linux AArch64 now. 🤷

Copy link
Member

@etcwilde etcwilde Jun 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh. I wonder if I should update my checkout too? I've got a crash with the same stack trace on x86_64 FreeBSD. ¯\_(ツ)_/¯

Edit: Nope, confirmed that those changes didn't fix my issue. ELF section headers are still being read wrong.


// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect
Expand Down
2 changes: 1 addition & 1 deletion utils/swift_build_support/swift_build_support/products/product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def install_toolchain_path(self, host_target):
if self.args.cross_compile_hosts:
if self.is_darwin_host(host_target):
install_destdir = self.host_install_destdir(host_target)
else:
elif self.args.cross_compile_append_host_target_to_destdir:
install_destdir = os.path.join(install_destdir, self.args.host_target)
return targets.toolchain_path(install_destdir,
self.args.install_prefix)
Expand Down