Skip to content

Use android commandline tool v20.#1503

Merged
juergw merged 3 commits into
google:masterfrom
juergw:master
Jun 2, 2026
Merged

Use android commandline tool v20.#1503
juergw merged 3 commits into
google:masterfrom
juergw:master

Conversation

@juergw
Copy link
Copy Markdown
Collaborator

@juergw juergw commented Jun 2, 2026

Using the newer commandline tool is preferable, as it will for example by default use 16k alignment.

This change requires us to use java 17, so we also upgrade that.

Also, I got a timeout in the tests. I think we can increase that limit to 30 min.

juergw added 3 commits June 2, 2026 07:44
This is preferable because it will enforce page alignment 16k.
This is needed by the new commandline tool version.
@juergw juergw requested a review from tholenst June 2, 2026 11:17
Copy link
Copy Markdown

@tholenst tholenst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where do we set the target android version? Do you know this?

@juergw
Copy link
Copy Markdown
Collaborator Author

juergw commented Jun 2, 2026

It's here:
https://github.com/google/conscrypt/blob/master/android/build.gradle#L15

androidMinSdkVersion = 19
androidTargetSdkVersion = 26

@tholenst
Copy link
Copy Markdown

tholenst commented Jun 2, 2026

SGTM.

@juergw juergw merged commit e4951fb into google:master Jun 2, 2026
82 checks passed
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.

2 participants