Skip to content

Commit 104eb77

Browse files
committed
Runtimes: adjust for incorrect Android behaviour
The runtime mixes `swift` and `swift_static` SDK layouts when building Swift code on Android. The overlay is always referenced in `swift` and never from `swift_static`. Adjust the layout to match the driver.
1 parent 97ddc4e commit 104eb77

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Runtimes/Overlay/Android/clang/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ install(FILES
3232
android.modulemap
3333
SwiftAndroidNDK.h
3434
SwiftBionic.h
35-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SwiftOverlay_PLATFORM_SUBDIR}/${SwiftOverlay_ARCH_SUBDIR})
35+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift/${SwiftOverlay_PLATFORM_SUBDIR}/${SwiftOverlay_ARCH_SUBDIR})
3636

3737
install(FILES
3838
posix_filesystem.apinotes

0 commit comments

Comments
 (0)