Skip to content

Commit 505827e

Browse files
committed
Runtimes: correct the Android overlay install more precisely
The install location of the APINotes is separate from the rest of the overlay content. These are installed unlabelled by the OS (which is a potential issue if there are conflicts with other OSes!). The swift swift-driver properly locates the APINotes it appears, but the C++ swift-driver does not. Install the APINotes to a location that both will function with.
1 parent 8d5084b commit 505827e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Runtimes/Overlay/Android/clang/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ target_compile_options(SwiftAndroid INTERFACE
3030

3131
install(FILES
3232
android.modulemap
33-
posix_filesystem.apinotes
34-
spawn.apinotes
3533
SwiftAndroidNDK.h
3634
SwiftBionic.h
3735
DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift/${SwiftOverlay_PLATFORM_SUBDIR}/${SwiftOverlay_ARCH_SUBDIR})
36+
37+
install(FILES
38+
posix_filesystem.apinotes
39+
spawn.apinotes
40+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift/apinotes)

0 commit comments

Comments
 (0)