commit b380d694e605e46500e411c792602e08cdbb6fb2 Author: sisbell shane.isbell@gmail.com Date: Tue Dec 10 18:36:08 2019 -0800

Bug 28764: OpenSSL Build for Android --- projects/openssl/build | 4 ++++ projects/openssl/config | 3 +++ 2 files changed, 7 insertions(+)

diff --git a/projects/openssl/build b/projects/openssl/build index 5851ff8..984d14a 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -17,6 +17,10 @@ export CC='gcc -m32' patch -p1 < $rootdir/escape-openssldir.patch patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] +# OpenSSL expects the NDK home to include the pre-assembled architecture directory +[% IF c("var/android") -%] + export ANDROID_NDK_HOME=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %] +[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] make diff --git a/projects/openssl/config b/projects/openssl/config index 450c4c9..c0861b6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -22,6 +22,9 @@ targets: osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 + android: + var: + configure_opts: CC=clang android-[% c("var/toolchain_arch") %] -no-shared

input_files: - project: container-image