Use libcrypto_static instead of libcrypto

Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.

Bug: 141248879
Test: m checkbuild
Change-Id: I5f0b9acfb57f68570f6f58f2395f2bb1bc015365
This commit is contained in:
Colin Cross 2019-09-18 11:04:35 -07:00
parent f3a5ab8b1d
commit f117f34aed
4 changed files with 9 additions and 8 deletions

View File

@ -253,7 +253,7 @@ cc_benchmark {
"libbase",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libcrypto_static",
"libdiagnose_usb",
"liblog",
"libusb",
@ -553,7 +553,7 @@ cc_binary {
"libbase",
"libbootloader_message",
"libcap",
"libcrypto",
"libcrypto_static",
"libcrypto_utils",
"libcutils",
"libdiagnose_usb",
@ -621,7 +621,7 @@ cc_test {
"libbootloader_message",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libcrypto_static",
"libdiagnose_usb",
"liblog",
"libusb",

View File

@ -17,7 +17,6 @@
liblp_lib_deps = [
"libbase",
"liblog",
"libcrypto",
"libcrypto_utils",
"libsparse",
"libext4_utils",
@ -41,7 +40,9 @@ cc_library {
"utility.cpp",
"writer.cpp",
],
shared_libs: liblp_lib_deps,
shared_libs: [
"libcrypto",
] + liblp_lib_deps,
target: {
windows: {
enabled: true,
@ -66,6 +67,7 @@ cc_defaults {
"libgmock",
"libfs_mgr",
"liblp",
"libcrypto_static",
] + liblp_lib_deps,
header_libs: [
"libstorage_literals_headers",

View File

@ -95,7 +95,7 @@ cc_test {
],
static_libs: [
"libcutils",
"libcrypto",
"libcrypto_static",
"libfs_mgr",
"libgmock",
"liblp",

View File

@ -100,7 +100,7 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \
libbase \
liblog \
libcrypto \
libcrypto_static \
libdl \
libz \
libselinux \
@ -118,7 +118,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SANITIZE := signed-integer-overflow
# First stage init is weird: it may start without stdout/stderr, and no /proc.
LOCAL_NOSANITIZE := hwaddress
LOCAL_INJECT_BSSL_HASH := true
include $(BUILD_EXECUTABLE)
endif