Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[android] Escape include paths in Android. #29502

Merged

Conversation

drodriguez
Copy link
Contributor

Before the result of _add_variant_c_compile_flags was a string, so appending several "-isystem" was not a problem. With #29451 the rules have changed since the list is now handled by CMake, and it deduplicates the repeated members in the list. Thanks, CMake.

Should fix the Android CI builds that were failing since the merging of #29451.

Before the result of `_add_variant_c_compile_flags` was a string, so appending several "-isystem" was not a problem. With swiftlang#29451 the rules have changed since the list is now handled by CMake, and it deduplicates the repeated members in the list. Thanks, CMake.

Should fix the Android CI builds that were failing since the merging of swiftlang#29451.
@drodriguez
Copy link
Contributor Author

Should not affect Darwin, Linux, nor Windows.

@swift-ci please smoke test

@compnerd
Copy link
Member

Personally, I think that we should split this into the three sites where it is used and use

swift_android_libcxx_include_paths(ANDROID_CXX_INCLUDES)
swift_android_include_for_arch("${..._ARCHITECTURE}"
  "ANDROID_${..._ARCHITECTURE}_INCLUDE")
target_include_directories(<TARGET> SYSTEM PRIVATE
  ${ANDROID_CXX_INCLUDES}
  ${ANDROID_${...ARCHITECTURE}_INCLUDE})

But, doing this to fix the bots first is fine.

@drodriguez
Copy link
Contributor Author

Yes, I think _add_variant_c_compile_flags and _add_variant_c_linker_flags should manipulate the target directly, instead of returning values. It will make the functions easier to think about.

@drodriguez drodriguez merged commit 8777a87 into swiftlang:master Jan 28, 2020
@drodriguez drodriguez deleted the android-escape-include-paths-correctly branch January 28, 2020 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants