[android] Fix test setup for Android to avoid using -sdk. #26366
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
The recently introduced changes to make the -sdk also the resource directory broke the tests in Android, since -sdk was being used because it is passed as --sysroot to child invocations, which was convinient. This commit removes those usages in the test suite, and switches to use --sysroot for the compiler and the linker. Even if in Android only the linker bit is necessary (since the NDK headers are somewhere different, and are passed as -I parameters to Swift).
|
@swift-ci please smoke test |
compnerd
approved these changes
Jul 26, 2019
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.
The recently introduced changes to make the -sdk also the resource
directory broke the tests in Android, since -sdk was being used because
it is passed as --sysroot to child invocations, which was convinient.
This commit removes those usages in the test suite, and switches to use
--sysroot for the compiler and the linker. Even if in Android only the
linker bit is necessary (since the NDK headers are somewhere different,
and are passed as -I parameters to Swift).
This should remove all the failing test in Android ARMv7 and AArch64 CI machines.