Support Android 29 in cross-compilation #95309
Merged
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
matthewbauer
requested review from
cdepillabout,
Ericson2314 and
nbp
as code owners
| @@ -63,7 +63,7 @@ let | |||
| DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} | |||
| INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} | |||
| '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' | |||
| Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} | |||
| Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} | |||
There was a problem hiding this comment.
Would you be able to put a comment on this line (and in the other files)? It is not immediately obvious to me why we need this if statement here.
matthewbauer
changed the title
We want stage1Only here even if system == system, since we can’t run the native arch simulator binaries locally.
This is referenced in all-packages.nix, so might as well leave it heref or now.
matthewbauer
force-pushed
the
mobile-fixes
branch
from
53240ef
to
c561738
Compare
matthewbauer
changed the title
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.
Some miscellaneous commits for getting Android 29 to work. Google Play requires Android 29 for new apps starting August 3, 2020 and updates starting November 2, 2020.
https://developer.android.com/distribute/play-policies#apps-must-target-api-level-29