commit ef590817fc328216594f1a634951ae245482d6e9 Author: Georg Koppen gk@torproject.org Date: Wed May 13 11:31:27 2020 +0000

Bug 33561: Upgrade OpenSSL to use Android NDK 20 --- projects/openssl/build | 2 +- projects/openssl/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/openssl/build b/projects/openssl/build index 8ceb952..5f275a0 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -17,7 +17,7 @@ export CC='gcc -m32' 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") -%] +[% IF c("var/android") && !c("var/android-fenix") -%] export ANDROID_NDK_HOME=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %] [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' diff --git a/projects/openssl/config b/projects/openssl/config index 7399c0a..ab62b14 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -24,7 +24,7 @@ targets: 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 + configure_opts: '[% IF c("var/android-fenix") %]CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %][% ELSE %]CC=clang android-[% c("var/toolchain_arch") %] -no-shared[% END %]'

input_files: - project: container-image