minizip: fix building for Android API level < 24 #26260
Open
+25
−2
Conversation
This file contains 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
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.
Summary
Changes to recipe: minizip/all
Motivation
Fixes building for Android API level < 24 again.
Details
An improvement over #15532. Not sure how/why it worked with Conan v1 previously, but now another adjustment is needed (maybe something changed in NDK, was testing with r27c now).
I've also opened PR in upstream: madler/zlib#1025, but Conan patch includes only one change from it as otherwise it'd require more patches (that line has changed between versions), the other one is already handled by the injected
IOAPI_NO_64macro.Also moved applying patches to
source().