update to Android NDK r19c #8992

AxelNennker · 2019-05-23T16:21:44Z

Signed-off-by: Axel Nennker axel@nennker.de

Update NOTES.Android from Android NDK 10 to the current r19c.

Android is about to deprecate gcc in favor of clang
All toolchains are now standalone
Compiler names now contain the Android API-level in their name e.g. aarch64-linux-android28-clang
Developers building for Android usually have Android Studio installed which has a build-in NDK in $HOME/Android/Sdk/ndk-bundle

levitte · 2019-05-26T11:22:52Z

Uhmmmm, seems like you sucked in a few other PRs...

Signed-off-by: Axel Nennker <axel.nennker@telekom.de>

AxelNennker · 2019-05-26T12:10:05Z

oops

Uhmmmm, seems like you sucked in a few other PRs...

fixed that, thank you

slontis · 2019-05-27T00:37:57Z

@levitte Should this still retain some info about how to build using an older toolchain?

slontis · 2019-05-27T00:38:56Z

@paulidale is this considered trivial for CLA purposes?

paulidale

I would not consider this trivial. A CLA will be required.

slontis · 2019-05-27T01:00:14Z

@AxelNennker please read https://www.openssl.org/policies/cla.html

levitte · 2019-05-27T08:33:22Z

NOTES.ANDROID

+    HOST_TAG=linux-x86_64 \
+    PATH=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin:$PATH \
+    CC=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang \
+    CXX=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang++ \


Why these two? I thought clang selected its target architecture with something like -target aarch64-linux-android28?, which our android target code already handles... I understand that you want clang, but in that case, shouldn't the following be enough?

CC=clang CXX=clang++

I think the target is without the API level aarch64-linux-android but the name of the clang compiler has now the 28 in it. If you use the ndk-bundle there is no aarch64-linux-android-clang but aarch64-linux-android16-clang to aarch64-linux-android29-clang.
If you use make-standalone-toolchain.sh the aarch64-linux-android-clang wrapper script(s) are created.
Regarding 'why not just set clang and clang++?': Configure complains if unprefixed tools are used, if I remember correctly. Also Configure falls back to gcc quite fast and so best to state what should be used.

Discussion about gcc deprecation is here: android/ndk#26
gcc deprecation timeline: https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md

There's code in Configurations/15-android.conf that goes to quite some length to make it easier. Maybe it needs adapting?

This PR is for the NOTES only. Yes, I think it makes sense to change the Android conf as well.
I wanted to keep this small for now and do the other steps later.

I have sent the CLA to openssl legal. What is the way forward?

petrovr · 2019-06-02T14:53:39Z

Axel Nennker wrote:

AxelNennker commented on this pull request. > - export ANDROID_NDK_HOME=/some/where/android-ndk-10d - PATH=$ANDROID_NDK_HOME/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin:$PATH - ./Configure android-arm -D__ANDROID_API__=14 + For example, to compile for target aarch64-linux-android using NDK r19c: + + export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk-bundle + NDK=$ANDROID_NDK_HOME \ + HOST_TAG=linux-x86_64 \ + PATH=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin:$PATH \ + CC=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang \ + CXX=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang++ \ This PR is for the NOTES only. Yes, I think it makes sense to change the Android conf as well. I wanted to keep this small for now and do the other steps later.

Above does not look acceptable. It is enough PATH to to be : PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH , without all those extra hacks. Roumen

…oid_ndk_r19c

AxelNennker · 2019-06-03T09:13:39Z

Axel Nennker wrote:
AxelNennker commented on this pull request. > - export ANDROID_NDK_HOME=/some/where/android-ndk-10d - PATH=$ANDROID_NDK_HOME/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin:$PATH - ./Configure android-arm -D__ANDROID_API__=14 + For example, to compile for target aarch64-linux-android using NDK r19c: + + export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk-bundle + NDK=$ANDROID_NDK_HOME \ + HOST_TAG=linux-x86_64 \ + PATH=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin:$PATH \ + CC=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang \ + CXX=$NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin/aarch64-linux-android28-clang++ \ This PR is for the NOTES only. Yes, I think it makes sense to change the Android conf as well. I wanted to keep this small for now and do the other steps later.
Above does not look acceptable. It is enough PATH to to be : PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH , without all those extra hacks. Roumen

I added e.g. HOST_TAG to make it clear you have to change that if you'r developing on e.g. darwin_x86_64. Anyway, I did what you requested and added a line explaining what needs to be done if linux_x86_64 does not work.

CLA is sent to legal. Who removes the cla-needed flag?

petrovr · 2019-06-03T18:23:56Z

Axel Nennker wrote:

I added e.g. HOST_TAG to make it clear the you have to change that if you'r developing on e.g. darwin_x86_64. Anyway, I did what you requested and added a line explaining what needs to be done if linux_x86_64 does not work.

Hmm darwin_x86_64 or linux_x86_64. I cannot see any relation between those targets and Android targets. So explanation makes no sense. Roumen

AxelNennker · 2019-06-04T13:03:49Z

Axel Nennker wrote:
I added e.g. HOST_TAG to make it clear the you have to change that if you'r developing on e.g. darwin_x86_64. Anyway, I did what you requested and added a line explaining what needs to be done if linux_x86_64 does not work.
Hmm darwin_x86_64 or linux_x86_64. I cannot see any relation between those targets and Android targets. So explanation makes no sense. Roumen

These are not the targets but where the binaries on the host system are.
Developers developing for Android usually install Android Studio which installs the Android SDK into $HOME/Android/Sdk
Depending on the host system different binaries are installed. On my Ubuntu system the binaries are in ~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/.... I think that on a MacOS system the binaries are in ~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64.
That is my interpretation of the description of the standalone toolchains directory structure
https://developer.android.com/ndk/guides/other_build_systems
That is why I initially had the HOST_TAG environment variable in this PR.

mattcaswell · 2019-07-17T12:28:14Z

Close/reopen to kick CLA bot

mattcaswell · 2019-07-17T12:29:10Z

@levitte do you have further comments on this?

Signed-off-by: Axel Nennker <axel.nennker@telekom.de>

eighthave · 2019-09-17T14:17:24Z

I'd love to see this move forward and get merged. What is here is better than what currently exists. I think Configurations/15-android.conf could be simplified a lot if support for the really old stuff was removed, e.g. the standalone NDK and NDK versions older than 16 or so. Both are long not supported.

For example:

--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -8,7 +8,7 @@
 
     my $android_ndk = {};
     my %triplet = (
-        arm    => "arm-linux-androideabi",
+        arm    => "armv7a-linux-androideabi",
         arm64  => "aarch64-linux-android",
         mips   => "mipsel-linux-android",
         mips64 => "mips64el-linux-android",
@@ -39,21 +39,27 @@
             $ndk = canonpath($ndk);
 
             my $ndkver = undef;
+            my $ndkbin = undef;
 
             if (open my $fh, "<$ndk/source.properties") {
                 local $_;
                 while(<$fh>) {
-                    if (m|Pkg\.Revision\s*=\s*([0-9]+)|) {
+                    if (m|^Pkg\.Revision\s*=\s*([0-9]+)|) {
                         $ndkver = $1;
                         last;
                     }
                 }
                 close $fh;
+                die "$ndk/source.properties is missing or corrupt!" if (!$ndkver);
+                if ($ndkver >= 19) {
+                    $ndkbin = "$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin";
+                    $ENV{'PATH'} = "$ndkbin:$ENV{'PATH'}";
+                }
             }
 
             my ($sysroot, $api, $arch);
 
             $config{target} =~ m|[^-]+-([^-]+)$|;      # split on dash
             $arch = $1;
 
             if ($sysroot = $ENV{CROSS_SYSROOT}) {
@@ -88,8 +94,13 @@
             my $cflags;
             my $cppflags;
 
-            # see if there is NDK clang on $PATH, "universal" or "standalone"
-            if (which("clang") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
+            if (which("$triarch$api-clang") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
+               my $ndkbinbase = "$ndkbin/$triarch";
+               $user{AR} = "$ndkbinbase-ar";
+               $user{CC} = "$ndkbinbase$api-clang";
+               $user{CXX} = "$ndkbinbase$api-clang++";
+               $user{RANLIB} = "$ndkbinbase-ranlib";
+            } elsif (which("clang") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) { # see if there is NDK clang on $PATH, "universal" or "standalone"

(I just emailed in my CLA).

eighthave · 2019-09-17T15:40:32Z

And some links to info about things to clean up which could happen in this pull request or later:

As of NDK r19, the "standalone toolchain" is now considered moot: https://developer.android.com/ndk/guides/standalone_toolchain
armeabi is no longer supported as an ABI as of NDK r17, only armeabi-v7a, and all MIPS ABIs were dropped: "Note: Historically the NDK supported ARMv5 (armeabi), and 32-bit and 64-bit MIPS, but support for these ABIs was removed in NDK r17." https://developer.android.com/ndk/guides/abis
clang can now be used without --sysroot or --isystem https://developer.android.com/ndk/guides/other_build_systems

openssl-machine · 2020-06-02T14:18:29Z

This issue is in a state where it requires action by @openssl/committers but the last update was 258 days ago

openssl-machine added the hold: cla required The contributor needs to submit a license agreement label May 26, 2019

update note to NDK 19c

51d3f0e

Signed-off-by: Axel Nennker <axel.nennker@telekom.de>

AxelNennker force-pushed the android_ndk_r19c branch from 0eb0b6e to 51d3f0e Compare May 26, 2019 12:07

typos

546691b

Signed-off-by: Axel Nennker <axel.nennker@telekom.de>

paulidale reviewed May 27, 2019

View reviewed changes

levitte requested changes May 27, 2019

View reviewed changes

Merge branch 'master' of https://github.com/openssl/openssl into andr…

e594868

…oid_ndk_r19c

mattcaswell closed this Jul 17, 2019

mattcaswell reopened this Jul 17, 2019

openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jul 17, 2019

remove HOST_TAG

fbedbf7

Signed-off-by: Axel Nennker <axel.nennker@telekom.de>

eighthave mentioned this pull request Sep 17, 2019

Building for Android with clang fails: "-mandroid" unknown argument #1531

Closed

iamamoose requested a review from levitte June 2, 2020 10:26

AxelNennker closed this Jun 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to Android NDK r19c #8992

update to Android NDK r19c #8992

AxelNennker commented May 23, 2019

levitte commented May 26, 2019

AxelNennker commented May 26, 2019

slontis commented May 27, 2019

slontis commented May 27, 2019

paulidale left a comment

slontis commented May 27, 2019

levitte May 27, 2019

AxelNennker May 27, 2019

levitte May 27, 2019

AxelNennker May 27, 2019

AxelNennker Jul 17, 2019

petrovr commented Jun 2, 2019 via email

AxelNennker commented Jun 3, 2019 •

edited

petrovr commented Jun 3, 2019 via email

AxelNennker commented Jun 4, 2019

mattcaswell commented Jul 17, 2019

mattcaswell commented Jul 17, 2019

eighthave commented Sep 17, 2019

eighthave commented Sep 17, 2019

openssl-machine commented Jun 2, 2020

update to Android NDK r19c #8992

update to Android NDK r19c #8992

Conversation

AxelNennker commented May 23, 2019

levitte commented May 26, 2019

AxelNennker commented May 26, 2019

slontis commented May 27, 2019

slontis commented May 27, 2019

paulidale left a comment

Choose a reason for hiding this comment

slontis commented May 27, 2019

levitte May 27, 2019

Choose a reason for hiding this comment

AxelNennker May 27, 2019

Choose a reason for hiding this comment

levitte May 27, 2019

Choose a reason for hiding this comment

AxelNennker May 27, 2019

Choose a reason for hiding this comment

AxelNennker Jul 17, 2019

Choose a reason for hiding this comment

petrovr commented Jun 2, 2019 via email

AxelNennker commented Jun 3, 2019 • edited

petrovr commented Jun 3, 2019 via email

AxelNennker commented Jun 4, 2019

mattcaswell commented Jul 17, 2019

mattcaswell commented Jul 17, 2019

eighthave commented Sep 17, 2019

eighthave commented Sep 17, 2019

openssl-machine commented Jun 2, 2020

AxelNennker commented Jun 3, 2019 •

edited