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
diff --git a/adb/Android.bp b/adb/Android.bp
index 57872b0..226e3eb 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -253,7 +253,7 @@
"libbase",
"libcutils",
"libcrypto_utils",
- "libcrypto",
+ "libcrypto_static",
"libdiagnose_usb",
"liblog",
"libusb",
@@ -553,7 +553,7 @@
"libbase",
"libbootloader_message",
"libcap",
- "libcrypto",
+ "libcrypto_static",
"libcrypto_utils",
"libcutils",
"libdiagnose_usb",
@@ -621,7 +621,7 @@
"libbootloader_message",
"libcutils",
"libcrypto_utils",
- "libcrypto",
+ "libcrypto_static",
"libdiagnose_usb",
"liblog",
"libusb",
diff --git a/fs_mgr/liblp/Android.bp b/fs_mgr/liblp/Android.bp
index b2572f6..13aaf00 100644
--- a/fs_mgr/liblp/Android.bp
+++ b/fs_mgr/liblp/Android.bp
@@ -17,7 +17,6 @@
liblp_lib_deps = [
"libbase",
"liblog",
- "libcrypto",
"libcrypto_utils",
"libsparse",
"libext4_utils",
@@ -41,7 +40,9 @@
"utility.cpp",
"writer.cpp",
],
- shared_libs: liblp_lib_deps,
+ shared_libs: [
+ "libcrypto",
+ ] + liblp_lib_deps,
target: {
windows: {
enabled: true,
@@ -66,6 +67,7 @@
"libgmock",
"libfs_mgr",
"liblp",
+ "libcrypto_static",
] + liblp_lib_deps,
header_libs: [
"libstorage_literals_headers",
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index f73b189..181aafb 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -95,7 +95,7 @@
],
static_libs: [
"libcutils",
- "libcrypto",
+ "libcrypto_static",
"libfs_mgr",
"libgmock",
"liblp",
diff --git a/init/Android.mk b/init/Android.mk
index 8f58437..359ebf8 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -100,7 +100,7 @@
libcutils \
libbase \
liblog \
- libcrypto \
+ libcrypto_static \
libdl \
libz \
libselinux \
@@ -118,7 +118,6 @@
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