[Android] fix NDK extract location #75968
Merged
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
|
@swift-ci please test |
andrurogerz
force-pushed
the
android-ndk-extract
branch
from
73295d1 to
93b850a
Compare
compnerd
approved these changes
Aug 19, 2024
The Android NDK is being extracted with an extra intermediate directory: $BinaryCache\android-ndk-r26b\android-ndk-r26b The Android build fails because it expects the NDK contents to live immediately under the directory: $BinaryCache\android-ndk-r26b The extra android-ndk-r26b sub-dir comes from the NDK zip archive itself, which we have no control over. To work-around, allow callers of Extract-ZipFile to control whether or not it should create the extraction sub-dir. Override the default behavior for NDK extraction only.
andrurogerz
force-pushed
the
android-ndk-extract
branch
from
93b850a to
511e879
Compare
|
@swift-ci please test |
|
@swift-ci please smoke test |
|
The issue fixed by this PR was introduced in ddedfe0 |
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 Android NDK is being extracted with an extra intermediate directory:
$BinaryCache\android-ndk-r26b\android-ndk-r26bThe Android build fails because it expects the NDK contents to live immediately under the directory:
$BinaryCache\android-ndk-r26bThe redundant
android-ndk-r26bsub-dir comes from the NDK zip archive itself, which we have no control over. To work-around, allow callers ofExtract-ZipFileto control whether or not it should create the extraction sub-dir. Override the default behavior for NDK extraction only.