-
Notifications
You must be signed in to change notification settings - Fork 984
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
upgrade android ndk to r17c #7698
Conversation
Pull Request Checklist
|
Jenkins BuildsClick to see older builds (12)
|
Doesn't seem the codebase likes the upgrade:
Not sure what |
Wondering if we should do this after we've merged the |
@pombeirp why? |
Signed-off-by: Jakub Sokołowski <jakub@status.im>
70ef9b6
to
bdb9243
Compare
.TOOLVERSIONS
Outdated
android-ndk;r10e;070be287539e3e7706f8dabfb6bf9879 | ||
android-sdk-build-tools;28.0.1; | ||
android-ndk;r17c;a4b6b8281e7d101efd994d31e64af746 | ||
android-sdk-build-tools;28.0.3; | ||
android-sdk-platform;android-27; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pombeirp we also need to use android-28, can we change this as well? Or this config doesn't have effect on docker image?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I'll push a new image with that change too. In your #status-core message you mentioned
we need to upgrade android-sdk-build-tools to 28.0.3 and android-sdk-platform to android-27
that's why I didn't change it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh I see, that was a mistake, sorry
Because all these dockerfiles disappear in that branch, so we'll need to redo this work in Nix before merging to develop. |
ok, I see. The problem here is that it probably will be a bit hard to maintain this PR because it's quite big, so if we switch to Nix soon then no problem to merge it after. Otherwise it might be a bit tricky with conflicts, already rebased it twice (though without huge difficulties). |
bdb9243
to
3b92545
Compare
I mean another PR #7666 :) |
android-sdk-platform;android-27; | ||
android-ndk;r17c;a4b6b8281e7d101efd994d31e64af746 | ||
android-sdk-build-tools;28.0.3; | ||
android-sdk-platform;android-28; | ||
android-sdk;4333796;aa190cfd7299cd6a1c687355bb2764e4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this line be changed? how do we manage this file btw? is this some docker related stuff?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is read when generating the Dockerfile to figure out which files to incorporate in it. It is also used to tag the Docker image with a different hash, depending on the values we put here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, understood
android-sdk-platform;android-27; | ||
android-ndk;r17c;a4b6b8281e7d101efd994d31e64af746 | ||
android-sdk-build-tools;28.0.3; | ||
android-sdk-platform;android-28; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
btw it seems that android-26
is hardcoded here https://github.com/status-im/status-react/blob/6d3211de46f302ab1a92eb3bb711733dd9cb8d9f/docker/android/Dockerfile#L13
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not too familiar with the Android SDK dependencies, I assume that we need this baseline 26 platform for some reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it is, that's kinda how sdkmanager
works, the packages included are named after the version of sdk. I guess it could be parametrized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah wait, it actually already is parametrized right below it:
https://github.com/status-im/status-react/blob/6d3211de46f302ab1a92eb3bb711733dd9cb8d9f/docker/android/Dockerfile#L14
So my guess would be that when I was building this it wouldn't work if also platform:android-26
was not installed.
When I build the app locally, I do see this:
The Maybe we should just update that module. cc @jeluard |
Considering we've merged the Nix branch and the way to manage NDK is this file now: |
Required by #7666
I've pushed the image and it's already up:
https://cloud.docker.com/u/statusteam/repository/docker/statusteam/status-build-android/tags