Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build-android] Create template for build-android #5

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

AndrewSB
Copy link
Member

No description provided.

zhuowei and others added 14 commits December 7, 2015 22:44
Update icu tar to match one referenced in build script
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-r12/sources/android/support/Android.mk` now
conditionally compiles based on the `LIBCXX_FORCE_REBUILD`
environment variable. Add the variable to our `build.sh`
invocation in order to ensure we actually build the stuff we need.
Android NDK r13 appears to have removed a level of nesting
within LLVM libc++. The "libcxx" subdirectory no longer exists.
@AndrewSB AndrewSB changed the title [WIP][build-android] Create template for build-android [build-android] Create template for build-android Jan 19, 2018
@AndrewSB
Copy link
Member Author

AndrewSB commented Jan 19, 2018

I think this is ready to go, I'm going to validate that this script works by running through the instructions on apple/swift/docs/Android.md

@modocache: I'll add you as a reviewer after I've validated this change myself

@modocache
Copy link
Member

Please do, thanks!

@AndrewSB
Copy link
Member Author

AndrewSB commented Jan 19, 2018

Currently having issues with the build.sh script

screen shot 2018-01-19 at 11 13 47 am

I also tried an invocation with APP_PLATFORM=android-21, thinking it may be because the android target is outdated, to no avail

I'm trying to see if I can build the upstream version now.

Do you have any ideas where the error could be coming from?

@modocache
Copy link
Member

It's been a while since I touched this, and unfortunately that error message doesn't really resemble anything I remember. Maybe grep for c32rtomb, since that seems to be tripping something up? Or look to see if anything interesting changed in https://github.com/pelya/libiconv-libicu-android, the upstream of this fork.

@AndrewSB
Copy link
Member Author

AndrewSB commented Jan 19, 2018

The fork was updated to support newer versions of the NDK, so we should definitely rebase because the instructions over at swift say to use the latest version and that isn't working.

I'm going to retry the build using ndk 14r to see if that works instead. I can also try the rebase, but I'm not familiar with either set of changes -- not pelya's nor ours. I'll ping you if I need help

@AndrewSB
Copy link
Member Author

It looks like our code is out of date, pelya's master builds perfectly. I'm trying to do a rebase, but I don't understand some of the patches we're carrying. For example: I'm not sure how to resolve the following merge conflict (applying 1cf9131):

screen shot 2018-01-22 at 9 35 37 am

@modocache do you remember why these changes were made, and would you be able to do a rebase? Or should I check with the author of 1cf9131?

@modocache
Copy link
Member

Yeah, @zhuowei might know!

@zhuowei
Copy link
Member

zhuowei commented Jan 22, 2018

@modocache @AndrewSB I think that the cflags were changed because Pelya's version used GNU libstdc++ as stl; it looks like they switched to LLVM libstdc++, so you can just use their version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants