Add support for building swift host libraries and tools for android host #23742
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ctories add_sourcekit_default_compiler_flags was invoking _add_variant_link_flags and getting link flags but not actually using the link_libraries or library_search_directories. In android builds, this means that the correct libc++ is not being linked against.
…ectories
The CMake variables ${sdk} and ${arch} are only set if
_add_variant_link_flags is invoked from add_swift_target_library calling
_add_swift_library_single. If you get to _add_swift_library_single from
add_swift_host_library, those variables will not be set and subsequent
linking will not find ICU libraries. This was an issue when building
swift host libraries on Android.
compnerd
approved these changes
Apr 2, 2019
CMakeLists.txt
Outdated
| @@ -746,7 +757,9 @@ endif() | |||
|
|
|||
| # Should we cross-compile the standard library for Android? | |||
| is_sdk_requested(ANDROID swift_build_android) | |||
| if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "") | |||
| if(swift_build_android | |||
| AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "" | |||
There was a problem hiding this comment.
I think it would be nicer if we sink the if (NOT ${SWIFT_ANDROID_NDK_PATH} STREQUAL "") into the case, as an always thing.
if(swift_build_android AND NOT ${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID)
if("${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
message(FATAL_ERROR "SWIFT_ANDROID_NDK_PATH must be set to the Android NDK path")
endif()
| @@ -467,12 +467,14 @@ function(_add_variant_link_flags) | |||
| endif() | |||
|
|
|||
| if(NOT "${SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC}" STREQUAL "") | |||
| get_filename_component(SWIFT_${sdk}_${arch}_ICU_UC_LIBDIR "${SWIFT_${sdk}_${arch}_ICU_UC}" DIRECTORY) | |||
| list(APPEND library_search_directories "${SWIFT_${sdk}_${arch}_ICU_UC_LIBDIR}") | |||
| get_filename_component(SWIFT_${LFLAGS_SDK}_${LFLAGS_ARCH}_ICU_UC_LIBDIR | |||
|
@swift-ci please test |
drodriguez
approved these changes
Apr 2, 2019
bulbazord
force-pushed
the
android_compiler
branch
from
8a28136 to
822eeb6
Compare
|
Build failed |
|
@swift-ci please smoke test and merge |
|
Umm, why was this merged when there's a more comprehensive Android pull, #23208, that's been waiting for weeks now? |
|
@buttaface: I will answer you in the other thread. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'd like to be able to build android host tools and libraries on android.
cc @compnerd @drodriguez