From fa0c4c7c5a47f3ef91355bf952b7e2364f8e2ce1 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Fri, 1 Mar 2024 10:36:59 -0800 Subject: [PATCH] remove the code to fetch libcrypto for android. we use aws-lc for android as well (#768) --- android/crt/build.gradle | 7 ------ android/crt/fetch_libcrypto.sh | 46 ---------------------------------- 2 files changed, 53 deletions(-) delete mode 100755 android/crt/fetch_libcrypto.sh diff --git a/android/crt/build.gradle b/android/crt/build.gradle index 7dc16056b..2c2f4c46c 100644 --- a/android/crt/build.gradle +++ b/android/crt/build.gradle @@ -3,13 +3,6 @@ import java.util.regex.Pattern apply plugin: 'com.android.library' apply plugin: 'signing' -// Before configuring, make sure libcrypto is installed -preBuild { - println('Installing libcrypto prebuilt binaries') - def exec = (project.file('fetch_libcrypto.sh').absolutePath).execute() - exec.waitForProcessOutput(System.out, System.err) -} - Properties getGitTag() { def gitTag = "git describe --tags".execute().text.trim() def version = new Properties() diff --git a/android/crt/fetch_libcrypto.sh b/android/crt/fetch_libcrypto.sh deleted file mode 100755 index 4be3c60c3..000000000 --- a/android/crt/fetch_libcrypto.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -# usage: fetch_libcrypto.sh (armeabi-v7a|arm64-v8a|x86|x86_64) - -set -ex - -if [ $# -eq 0 ]; then - $0 armeabi-v7a - $0 arm64-v8a - $0 x86 - $0 x86_64 - exit 0 -fi - -# Ensure 1 argument, the ABI -[ $# -eq 1 ] - -pushd $(dirname $0) - -cmake_binary_dir=../../target/cmake-build -android_abi=$1 - -# Map android ABI -> the ABI name we use for prebuilt libs -if [ $android_abi == 'armeabi-v7a' ]; then - AWS_ANDROID_ABI=arm -elif [ $android_abi == 'arm64-v8a' ]; then - AWS_ANDROID_ABI=arm64 -elif [ $android_abi == 'x86' ]; then - AWS_ANDROID_ABI=x86 -elif [ $android_abi == 'x86_64' ]; then - AWS_ANDROID_ABI=x86_64 -fi - -[ ! -z "${AWS_ANDROID_ABI}" ] - -echo "Installing libcrypto for Android ${AWS_ANDROID_ABI}" - -mkdir -p ${cmake_binary_dir}/deps/${android_abi}/libcrypto -if [ ! -e ${cmake_binary_dir}/deps/${android_abi}/libcrypto/libcrypto-1.1.1-android-${AWS_ANDROID_ABI}.tar.gz ]; then - curl -sSL --retry 3 "https://d19elf31gohf1l.cloudfront.net/_binaries/libcrypto/libcrypto-1.1.1-android-${AWS_ANDROID_ABI}.tar.gz" \ - -o "${cmake_binary_dir}/deps/${android_abi}/libcrypto/libcrypto-1.1.1-android-${AWS_ANDROID_ABI}.tar.gz" -fi - -tar xzf "${cmake_binary_dir}/deps/${android_abi}/libcrypto/libcrypto-1.1.1-android-${AWS_ANDROID_ABI}.tar.gz" -C ${cmake_binary_dir}/deps/${android_abi}/libcrypto - -popd