Rebase upstream changes in #6
Closed
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
…eabi-v7a, build icu 55.1
|
TODO from Boris:
$ grep RELEASE.TXT setCrossEnvironment-*
setCrossEnvironment-armeabi-v7a.sh:grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
setCrossEnvironment-x86.sh:grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64”
|
Changed default NDK version from 4.8 to 4.9
Seems like `RELEASE.TXT` is gone, so `arch` is now used to determine if we're running on 64bit or not. I'm unsure how to properly check for this on Windows, though.
Android NDK r13 appears to have removed a level of nesting within LLVM libc++. The "libcxx" subdirectory no longer exists.
Swift is expecting this libraries to be named `icuucswift` for Android to avoid name collision with Android's `icuuc`. This should be temporal, a more appropriate solution (if any) should be applied to solve this lib conflict.
|
Closing this in favor of @lanza's work that was merged into pelya's fork |
lanza
pushed a commit
that referenced
this pull request
May 4, 2018
Fix some issues with Darwin host compatibility
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
I'm really not sure if I rebased this correctly. I was specifically worried about your commits @zhuowei, and @neonichu. I biased towards accepting pelya's changes over our own. If the two of you could look over this, it would make me feel much more comfortable.
Currently investigating:
I'm going to look into the 3 issues soon, then I'll ask for review 😄