From cccd2315c4fa5b3b831493eb5afd3ab26ae30ce0 Mon Sep 17 00:00:00 2001 From: Kevin May Date: Tue, 17 May 2022 10:36:16 +0100 Subject: IVGCVSW-6758 Build libcrypto as a static library Signed-off-by: Kevin May Change-Id: I0201324cf060ee52cef07077e3ed8e31e7fd4c2d --- shim/sl/CMakeLists.txt | 290 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 286 insertions(+), 4 deletions(-) diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt index 3ce4b30c5f..97c544c1b9 100644 --- a/shim/sl/CMakeLists.txt +++ b/shim/sl/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required (VERSION 3.7.0) +enable_language(ASM) project(armnn_support_library) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 -Wall -fexceptions -Werror -Wno-unused-parameter -Wno-unused-private-field -Wno-unused-variable -Wno-attributes -Wno-format-security -Wno-extern-c-compat -Wno-invalid-partial-specialization -Wno-unneeded-internal-declaration -Wno-unused-function -DNN_COMPATIBILITY_LIBRARY_BUILD -DNN_DEBUGGABLE") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -DOPENSSL_SMALL -DBORINGSSL_ANDROID_SYSTEM -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION") set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -24,6 +26,7 @@ list(APPEND libnnapi_support_include_directories aosp/external/gemmlowp/ aosp/external/ruy/ aosp/external/eigen/ + aosp/external/boringssl/src/include aosp/external/boringssl/include) include_directories(${libnnapi_support_include_directories}) @@ -158,6 +161,288 @@ add_library(neuralnetworks_cl OBJECT ${neuralnetworks_cl_sources}) target_include_directories (neuralnetworks_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (neuralnetworks_cl PUBLIC ${libnnapi_support_include_directories}) +set(crypto_static_sources) +list(APPEND crypto_static_sources + aosp/external/boringssl/err_data.c + aosp/external/boringssl/src/crypto/asn1/a_bitstr.c + aosp/external/boringssl/src/crypto/asn1/a_bool.c + aosp/external/boringssl/src/crypto/asn1/a_d2i_fp.c + aosp/external/boringssl/src/crypto/asn1/a_dup.c + aosp/external/boringssl/src/crypto/asn1/a_enum.c + aosp/external/boringssl/src/crypto/asn1/a_gentm.c + aosp/external/boringssl/src/crypto/asn1/a_i2d_fp.c + aosp/external/boringssl/src/crypto/asn1/a_int.c + aosp/external/boringssl/src/crypto/asn1/a_mbstr.c + aosp/external/boringssl/src/crypto/asn1/a_object.c + aosp/external/boringssl/src/crypto/asn1/a_octet.c + aosp/external/boringssl/src/crypto/asn1/a_print.c + aosp/external/boringssl/src/crypto/asn1/a_strex.c + aosp/external/boringssl/src/crypto/asn1/a_strnid.c + aosp/external/boringssl/src/crypto/asn1/a_time.c + aosp/external/boringssl/src/crypto/asn1/a_type.c + aosp/external/boringssl/src/crypto/asn1/a_utctm.c + aosp/external/boringssl/src/crypto/asn1/a_utf8.c + aosp/external/boringssl/src/crypto/asn1/asn1_lib.c + aosp/external/boringssl/src/crypto/asn1/asn1_par.c + aosp/external/boringssl/src/crypto/asn1/asn_pack.c + aosp/external/boringssl/src/crypto/asn1/f_int.c + aosp/external/boringssl/src/crypto/asn1/f_string.c + aosp/external/boringssl/src/crypto/asn1/tasn_dec.c + aosp/external/boringssl/src/crypto/asn1/tasn_enc.c + aosp/external/boringssl/src/crypto/asn1/tasn_fre.c + aosp/external/boringssl/src/crypto/asn1/tasn_new.c + aosp/external/boringssl/src/crypto/asn1/tasn_typ.c + aosp/external/boringssl/src/crypto/asn1/tasn_utl.c + aosp/external/boringssl/src/crypto/asn1/time_support.c + aosp/external/boringssl/src/crypto/base64/base64.c + aosp/external/boringssl/src/crypto/bio/bio.c + aosp/external/boringssl/src/crypto/bio/bio_mem.c + aosp/external/boringssl/src/crypto/bio/connect.c + aosp/external/boringssl/src/crypto/bio/fd.c + aosp/external/boringssl/src/crypto/bio/file.c + aosp/external/boringssl/src/crypto/bio/hexdump.c + aosp/external/boringssl/src/crypto/bio/pair.c + aosp/external/boringssl/src/crypto/bio/printf.c + aosp/external/boringssl/src/crypto/bio/socket.c + aosp/external/boringssl/src/crypto/bio/socket_helper.c + aosp/external/boringssl/src/crypto/blake2/blake2.c + aosp/external/boringssl/src/crypto/bn_extra/bn_asn1.c + aosp/external/boringssl/src/crypto/bn_extra/convert.c + aosp/external/boringssl/src/crypto/buf/buf.c + aosp/external/boringssl/src/crypto/bytestring/asn1_compat.c + aosp/external/boringssl/src/crypto/bytestring/ber.c + aosp/external/boringssl/src/crypto/bytestring/cbb.c + aosp/external/boringssl/src/crypto/bytestring/cbs.c + aosp/external/boringssl/src/crypto/bytestring/unicode.c + aosp/external/boringssl/src/crypto/bytestring/unicode.c + aosp/external/boringssl/src/crypto/chacha/chacha.c + aosp/external/boringssl/src/crypto/cipher_extra/cipher_extra.c + aosp/external/boringssl/src/crypto/cipher_extra/derive_key.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesccm.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c + aosp/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c + aosp/external/boringssl/src/crypto/cipher_extra/e_des.c + aosp/external/boringssl/src/crypto/cipher_extra/e_null.c + aosp/external/boringssl/src/crypto/cipher_extra/e_rc2.c + aosp/external/boringssl/src/crypto/cipher_extra/e_rc4.c + aosp/external/boringssl/src/crypto/cipher_extra/e_tls.c + aosp/external/boringssl/src/crypto/cipher_extra/tls_cbc.c + aosp/external/boringssl/src/crypto/cmac/cmac.c + aosp/external/boringssl/src/crypto/conf/conf.c + aosp/external/boringssl/src/crypto/cpu_aarch64_apple.c + aosp/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c + aosp/external/boringssl/src/crypto/cpu_aarch64_linux.c + aosp/external/boringssl/src/crypto/cpu_aarch64_win.c + aosp/external/boringssl/src/crypto/cpu_arm.c + aosp/external/boringssl/src/crypto/cpu_arm_linux.c + aosp/external/boringssl/src/crypto/cpu_intel.c + aosp/external/boringssl/src/crypto/cpu_ppc64le.c + aosp/external/boringssl/src/crypto/crypto.c + aosp/external/boringssl/src/crypto/curve25519/curve25519.c + aosp/external/boringssl/src/crypto/curve25519/spake25519.c + aosp/external/boringssl/src/crypto/des/des.c + aosp/external/boringssl/src/crypto/dh_extra/dh_asn1.c + aosp/external/boringssl/src/crypto/dh_extra/params.c + aosp/external/boringssl/src/crypto/digest_extra/digest_extra.c + aosp/external/boringssl/src/crypto/dsa/dsa.c + aosp/external/boringssl/src/crypto/dsa/dsa_asn1.c + aosp/external/boringssl/src/crypto/ec_extra/ec_asn1.c + aosp/external/boringssl/src/crypto/ec_extra/ec_derive.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesccm.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c + aosp/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c + aosp/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c + aosp/external/boringssl/src/crypto/cipher_extra/e_des.c + aosp/external/boringssl/src/crypto/cipher_extra/e_null.c + aosp/external/boringssl/src/crypto/cipher_extra/e_rc2.c + aosp/external/boringssl/src/crypto/cipher_extra/e_rc4.c + aosp/external/boringssl/src/crypto/cipher_extra/e_tls.c + aosp/external/boringssl/src/crypto/cipher_extra/tls_cbc.c + aosp/external/boringssl/src/crypto/cmac/cmac.c + aosp/external/boringssl/src/crypto/conf/conf.c + aosp/external/boringssl/src/crypto/cpu_aarch64_apple.c + aosp/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c + aosp/external/boringssl/src/crypto/cpu_aarch64_linux.c + aosp/external/boringssl/src/crypto/cpu_aarch64_win.c + aosp/external/boringssl/src/crypto/cpu_arm.c + aosp/external/boringssl/src/crypto/cpu_arm_linux.c + aosp/external/boringssl/src/crypto/cpu_intel.c + aosp/external/boringssl/src/crypto/cpu_ppc64le.c + aosp/external/boringssl/src/crypto/crypto.c + aosp/external/boringssl/src/crypto/curve25519/curve25519.c + aosp/external/boringssl/src/crypto/curve25519/spake25519.c + aosp/external/boringssl/src/crypto/des/des.c + aosp/external/boringssl/src/crypto/dh_extra/dh_asn1.c + aosp/external/boringssl/src/crypto/dh_extra/params.c + aosp/external/boringssl/src/crypto/digest_extra/digest_extra.c + aosp/external/boringssl/src/crypto/dsa/dsa.c + aosp/external/boringssl/src/crypto/dsa/dsa_asn1.c + aosp/external/boringssl/src/crypto/ec_extra/ec_asn1.c + aosp/external/boringssl/src/crypto/ec_extra/ec_derive.c + aosp/external/boringssl/src/crypto/ec_extra/hash_to_curve.c + aosp/external/boringssl/src/crypto/ecdh_extra/ecdh_extra.c + aosp/external/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c + aosp/external/boringssl/src/crypto/engine/engine.c + aosp/external/boringssl/src/crypto/err/err.c + aosp/external/boringssl/src/crypto/evp/digestsign.c + aosp/external/boringssl/src/crypto/evp/evp.c + aosp/external/boringssl/src/crypto/evp/evp_asn1.c + aosp/external/boringssl/src/crypto/evp/evp_ctx.c + aosp/external/boringssl/src/crypto/evp/p_dsa_asn1.c + aosp/external/boringssl/src/crypto/evp/p_ec.c + aosp/external/boringssl/src/crypto/evp/p_ec_asn1.c + aosp/external/boringssl/src/crypto/evp/p_ed25519.c + aosp/external/boringssl/src/crypto/evp/p_ed25519_asn1.c + aosp/external/boringssl/src/crypto/evp/p_rsa.c + aosp/external/boringssl/src/crypto/evp/p_rsa_asn1.c + aosp/external/boringssl/src/crypto/evp/p_x25519.c + aosp/external/boringssl/src/crypto/evp/p_x25519_asn1.c + aosp/external/boringssl/src/crypto/evp/pbkdf.c + aosp/external/boringssl/src/crypto/evp/print.c + aosp/external/boringssl/src/crypto/evp/scrypt.c + aosp/external/boringssl/src/crypto/evp/sign.c + aosp/external/boringssl/src/crypto/ex_data.c + aosp/external/boringssl/src/crypto/fipsmodule/fips_shared_support.c + aosp/external/boringssl/src/crypto/hkdf/hkdf.c + aosp/external/boringssl/src/crypto/hpke/hpke.c + aosp/external/boringssl/src/crypto/hrss/hrss.c + aosp/external/boringssl/src/crypto/lhash/lhash.c + aosp/external/boringssl/src/crypto/mem.c + aosp/external/boringssl/src/crypto/obj/obj.c + aosp/external/boringssl/src/crypto/obj/obj_xref.c + aosp/external/boringssl/src/crypto/pem/pem_all.c + aosp/external/boringssl/src/crypto/pem/pem_info.c + aosp/external/boringssl/src/crypto/pem/pem_lib.c + aosp/external/boringssl/src/crypto/pem/pem_oth.c + aosp/external/boringssl/src/crypto/pem/pem_pk8.c + aosp/external/boringssl/src/crypto/pem/pem_pkey.c + aosp/external/boringssl/src/crypto/pem/pem_x509.c + aosp/external/boringssl/src/crypto/pem/pem_xaux.c + aosp/external/boringssl/src/crypto/pkcs7/pkcs7.c + aosp/external/boringssl/src/crypto/pkcs7/pkcs7_x509.c + aosp/external/boringssl/src/crypto/pkcs8/p5_pbev2.c + aosp/external/boringssl/src/crypto/pkcs8/pkcs8.c + aosp/external/boringssl/src/crypto/pkcs8/pkcs8_x509.c + aosp/external/boringssl/src/crypto/poly1305/poly1305.c + aosp/external/boringssl/src/crypto/poly1305/poly1305_arm.c + aosp/external/boringssl/src/crypto/poly1305/poly1305_vec.c + aosp/external/boringssl/src/crypto/pool/pool.c + aosp/external/boringssl/src/crypto/rand_extra/deterministic.c + aosp/external/boringssl/src/crypto/rand_extra/forkunsafe.c + aosp/external/boringssl/src/crypto/rand_extra/fuchsia.c + aosp/external/boringssl/src/crypto/rand_extra/passive.c + aosp/external/boringssl/src/crypto/rand_extra/rand_extra.c + aosp/external/boringssl/src/crypto/rand_extra/windows.c + aosp/external/boringssl/src/crypto/rc4/rc4.c + aosp/external/boringssl/src/crypto/refcount_c11.c + aosp/external/boringssl/src/crypto/refcount_lock.c + aosp/external/boringssl/src/crypto/rsa_extra/rsa_asn1.c + aosp/external/boringssl/src/crypto/rsa_extra/rsa_print.c + aosp/external/boringssl/src/crypto/siphash/siphash.c + aosp/external/boringssl/src/crypto/stack/stack.c + aosp/external/boringssl/src/crypto/thread.c + aosp/external/boringssl/src/crypto/thread_none.c + aosp/external/boringssl/src/crypto/thread_pthread.c + aosp/external/boringssl/src/crypto/thread_win.c + aosp/external/boringssl/src/crypto/trust_token/pmbtoken.c + aosp/external/boringssl/src/crypto/trust_token/trust_token.c + aosp/external/boringssl/src/crypto/trust_token/voprf.c + aosp/external/boringssl/src/crypto/x509/a_digest.c + aosp/external/boringssl/src/crypto/x509/a_sign.c + aosp/external/boringssl/src/crypto/x509/a_verify.c + aosp/external/boringssl/src/crypto/x509/algorithm.c + aosp/external/boringssl/src/crypto/x509/asn1_gen.c + aosp/external/boringssl/src/crypto/x509/by_dir.c + aosp/external/boringssl/src/crypto/x509/by_file.c + aosp/external/boringssl/src/crypto/x509/i2d_pr.c + aosp/external/boringssl/src/crypto/x509/name_print.c + aosp/external/boringssl/src/crypto/x509/rsa_pss.c + aosp/external/boringssl/src/crypto/x509/t_crl.c + aosp/external/boringssl/src/crypto/x509/t_req.c + aosp/external/boringssl/src/crypto/x509/t_x509.c + aosp/external/boringssl/src/crypto/x509/t_x509a.c + aosp/external/boringssl/src/crypto/x509/x509.c + aosp/external/boringssl/src/crypto/x509/x509_att.c + aosp/external/boringssl/src/crypto/x509/x509_cmp.c + aosp/external/boringssl/src/crypto/x509/x509_d2.c + aosp/external/boringssl/src/crypto/x509/x509_def.c + aosp/external/boringssl/src/crypto/x509/x509_ext.c + aosp/external/boringssl/src/crypto/x509/x509_lu.c + aosp/external/boringssl/src/crypto/x509/x509_obj.c + aosp/external/boringssl/src/crypto/x509/x509_req.c + aosp/external/boringssl/src/crypto/x509/x509_set.c + aosp/external/boringssl/src/crypto/x509/x509_trs.c + aosp/external/boringssl/src/crypto/x509/x509_txt.c + aosp/external/boringssl/src/crypto/x509/x509_v3.c + aosp/external/boringssl/src/crypto/x509/x509_vfy.c + aosp/external/boringssl/src/crypto/x509/x509_vpm.c + aosp/external/boringssl/src/crypto/x509/x509cset.c + aosp/external/boringssl/src/crypto/x509/x509name.c + aosp/external/boringssl/src/crypto/x509/x509rset.c + aosp/external/boringssl/src/crypto/x509/x509spki.c + aosp/external/boringssl/src/crypto/x509/x_algor.c + aosp/external/boringssl/src/crypto/x509/x_all.c + aosp/external/boringssl/src/crypto/x509/x_attrib.c + aosp/external/boringssl/src/crypto/x509/x_crl.c + aosp/external/boringssl/src/crypto/x509/x_exten.c + aosp/external/boringssl/src/crypto/x509/x_info.c + aosp/external/boringssl/src/crypto/x509/x_name.c + aosp/external/boringssl/src/crypto/x509/x_pkey.c + aosp/external/boringssl/src/crypto/x509/x_pubkey.c + aosp/external/boringssl/src/crypto/x509/x_req.c + aosp/external/boringssl/src/crypto/x509/x_sig.c + aosp/external/boringssl/src/crypto/x509/x_spki.c + aosp/external/boringssl/src/crypto/x509/x_val.c + aosp/external/boringssl/src/crypto/x509/x_x509.c + aosp/external/boringssl/src/crypto/x509/x_x509a.c + aosp/external/boringssl/src/crypto/x509v3/pcy_cache.c + aosp/external/boringssl/src/crypto/x509v3/pcy_data.c + aosp/external/boringssl/src/crypto/x509v3/pcy_lib.c + aosp/external/boringssl/src/crypto/x509v3/pcy_map.c + aosp/external/boringssl/src/crypto/x509v3/pcy_node.c + aosp/external/boringssl/src/crypto/x509v3/pcy_tree.c + aosp/external/boringssl/src/crypto/x509v3/v3_akey.c + aosp/external/boringssl/src/crypto/x509v3/v3_akeya.c + aosp/external/boringssl/src/crypto/x509v3/v3_alt.c + aosp/external/boringssl/src/crypto/x509v3/v3_bcons.c + aosp/external/boringssl/src/crypto/x509v3/v3_bitst.c + aosp/external/boringssl/src/crypto/x509v3/v3_conf.c + aosp/external/boringssl/src/crypto/x509v3/v3_cpols.c + aosp/external/boringssl/src/crypto/x509v3/v3_crld.c + aosp/external/boringssl/src/crypto/x509v3/v3_enum.c + aosp/external/boringssl/src/crypto/x509v3/v3_extku.c + aosp/external/boringssl/src/crypto/x509v3/v3_genn.c + aosp/external/boringssl/src/crypto/x509v3/v3_ia5.c + aosp/external/boringssl/src/crypto/x509v3/v3_info.c + aosp/external/boringssl/src/crypto/x509v3/v3_int.c + aosp/external/boringssl/src/crypto/x509v3/v3_lib.c + aosp/external/boringssl/src/crypto/x509v3/v3_ncons.c + aosp/external/boringssl/src/crypto/x509v3/v3_ocsp.c + aosp/external/boringssl/src/crypto/x509v3/v3_pci.c + aosp/external/boringssl/src/crypto/x509v3/v3_pcia.c + aosp/external/boringssl/src/crypto/x509v3/v3_pcons.c + aosp/external/boringssl/src/crypto/x509v3/v3_pmaps.c + aosp/external/boringssl/src/crypto/x509v3/v3_prn.c + aosp/external/boringssl/src/crypto/x509v3/v3_purp.c + aosp/external/boringssl/src/crypto/x509v3/v3_skey.c + aosp/external/boringssl/src/crypto/x509v3/v3_utl.c + aosp/external/boringssl/src/crypto/fipsmodule/bcm.c + aosp/external/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S + aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S + ) + +add_library(crypto_static STATIC ${crypto_static_sources}) +target_include_directories (crypto_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories (crypto_static PUBLIC ${libnnapi_support_include_directories}) + # Add Armnn as a Dependency message(STATUS "ARMNN_SOURCE_DIR: ${ARMNN_SOURCE_DIR}") set(Armnn_DIR "${ARMNN_SOURCE_DIR}/build") @@ -203,6 +488,7 @@ target_link_libraries(armnn_support_library PRIVATE thirdparty_headers) target_link_libraries(armnn_support_library PRIVATE neuralnetworks_types_cl) target_link_libraries(armnn_support_library PRIVATE neuralnetworks_common_cl) target_link_libraries(armnn_support_library PRIVATE neuralnetworks_cl) +target_link_libraries(armnn_support_library PRIVATE -Wl, -Bsymbolic, crypto_static) target_link_libraries(armnn_support_library PRIVATE base) target_include_directories(armnn_support_library PUBLIC ${libnnapi_support_include_directories}) @@ -217,8 +503,4 @@ target_link_libraries(armnn_support_library PUBLIC ${log-lib}) find_library(nativewindow-lib nativewindow) target_link_libraries(armnn_support_library PUBLIC ${nativewindow-lib}) -## find the libcrypto -set(CRYPTO_LIB_ROOT ${ARMNN_SOURCE_DIR}/shim/sl/aosp/prebuilts/vndk/v29) -target_link_libraries(armnn_support_library PUBLIC ${CRYPTO_LIB_ROOT}/arm64/arch-arm64-armv8-a/shared/vndk-core/libcrypto.so) - #################################################### -- cgit v1.2.1