Skip to content

Commit b2f5252

Browse files
authored
[android] Disable a couple Reflection tests and fix an install path (#82620)
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.
1 parent 46572f8 commit b2f5252

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function(_report_sdk prefix)
5353
endforeach()
5454
elseif("${prefix}" STREQUAL "ANDROID")
5555
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
56-
message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
56+
message(STATUS " NDK: ${SWIFT_ANDROID_NDK_PATH}")
5757
endif()
5858
if(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
5959
message(STATUS " Sysroot: ${SWIFT_ANDROID_NATIVE_SYSROOT}")

test/Reflection/conformance_descriptors.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//
66
// Temporarily disable on AArch64 Linux (rdar://88451721)
77
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
8+
// XFAIL: OS=linux-android
89

910
// rdar://100558042
1011
// UNSUPPORTED: CPU=arm64e

test/Reflection/typeref_decoding.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// FIXME: rdar://127796117
1212
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64
13+
// XFAIL: OS=linux-android
1314

1415
// 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)
1516
// 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

utils/swift_build_support/swift_build_support/products/product.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def install_toolchain_path(self, host_target):
212212
if self.args.cross_compile_hosts:
213213
if self.is_darwin_host(host_target):
214214
install_destdir = self.host_install_destdir(host_target)
215-
else:
215+
elif self.args.cross_compile_append_host_target_to_destdir:
216216
install_destdir = os.path.join(install_destdir, self.args.host_target)
217217
return targets.toolchain_path(install_destdir,
218218
self.args.install_prefix)

0 commit comments

Comments
 (0)