averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
The tests broke on the community Android CI since #82325, and I just
noticed the install issue when cross-compiling Testing with a
freshly-built compiler, which I'd never done before. Also, fix the NDK
path shown in the CMake output.
This commit is contained in:
finagolfin
2025-07-02 09:41:59 +05:30
committed by GitHub
parent 46572f80a2
commit b2f52524c5
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/SwiftConfigureSDK.cmake
View File

@@ -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}")

1
test/Reflection/conformance_descriptors.swift
View File

@@ -5,6 +5,7 @@
//
// Temporarily disable on AArch64 Linux (rdar://88451721)
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
// XFAIL: OS=linux-android
// rdar://100558042
// UNSUPPORTED: CPU=arm64e

1
test/Reflection/typeref_decoding.swift
View File

@@ -10,6 +10,7 @@
// FIXME: rdar://127796117
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
// XFAIL: OS=linux-android
// 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

2
utils/swift_build_support/swift_build_support/products/product.py
View File

@@ -212,7 +212,7 @@ class Product(object):
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)