Support for Android NDK r22-beta1 #13434
Conversation
|
This looks ok to my eye, but I'd like @levitte to take a look. I've added the "CLA: trivial" label for now, because you've flagged it as such. However I think this change goes beyond our definition of trivial and that a CLA is required: |
|
I will submit one then. Do I need to force push to get rid of the "CLA: trivial" in the commit message afterwards or is it fine as is? |
I think builds using standalone toolchain are fine so I left them alone, but `Configure` will fail if using the NDK directly because the `platforms` and `sysroot` directories were removed. If `sysroot` is missing, omit the `--sysroot` and `-gcc-toolchain` arguments and use the triplet form clang command. Also since `platforms` was being used for the default API level, use `meta/platforms.json` instead if needed.
417bc82
|
I went ahead and force pushed the same commit with the CLA part removed made the email address match the one I registered in the CLA. |
|
Needs second review |
|
I can't claim understanding the whole Android structure, but this was clear enough. Good work! |
|
24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually. |
I think builds using standalone toolchain are fine so I left them alone, but `Configure` will fail if using the NDK directly because the `platforms` and `sysroot` directories were removed. If `sysroot` is missing, omit the `--sysroot` and `-gcc-toolchain` arguments and use the triplet form clang command. Also since `platforms` was being used for the default API level, use `meta/platforms.json` instead if needed. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from #13434)
|
Merged 948fd7a Support for Android NDK r22-beta1 |
Use my openssl fork until openssl/openssl#13434 makes it into a release. Also try API Level 30 Use nproc for make -j
|
Please backport this to OpenSSL 1.1.1 branch. |
This is a backport of openssl#13434 to fix openssl#13685. I think builds using standalone toolchain are fine so I left them alone, but `Configure` will fail if using the NDK directly because the `platforms` and `sysroot` directories were removed. If `sysroot` is missing, omit the `--sysroot` and `-gcc-toolchain` arguments and use the triplet form clang command. Also since `platforms` was being used for the default API level, use `meta/platforms.json` instead if needed.
This is a backport of openssl#13434, Fixes openssl#13685. I think builds using standalone toolchain are fine so I left them alone, but `Configure` will fail if using the NDK directly because the `platforms` and `sysroot` directories were removed. If `sysroot` is missing, omit the `--sysroot` and `-gcc-toolchain` arguments and use the triplet form clang command. Also since `platforms` was being used for the default API level, use `meta/platforms.json` instead if needed.
|
I fixed it on my side using #13694. Works smoothly. Good job. |
- Fix check for r23 - Use Latest 1.1.1 - Use alpha 3.0 since openssl/openssl#13434 was merged quite a awhile ago.
I think builds using standalone toolchain are fine so I left them alone, but
Configurewill fail if using the NDK directly because theplatformsandsysrootdirectories were removed.If
sysrootis missing, omit the--sysrootand-gcc-toolchainarguments and use the triplet form clang command.Also since
platformswas being used for the default API level, usemeta/platforms.jsoninstead if needed.I tested this by building with r21d and r22-beta1, both using the NDK directly and using a standalone toolchain. These were just builds. I included "CLA: trivial" in my commit message, but am unsure if this is actually considered trivial or not.