diff --git a/android/app/Android.bp b/android/app/Android.bp
index aee08c0eeeac4a5e5a7bf16f24a252b7828e40cd..a09f45af53e603c148ea1f2398c52b39770df41f 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -111,6 +111,7 @@ cc_library_shared {
         "android.system.suspend-V1-ndk",
         "libaaudio",
         "libbinder_ndk",
+        "libcrypto",
         "libfmq",
         "libnativehelper",
     ],
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 4cf28f4ff93aba74ec65b8a21806a4e47a88e811..918793a1faea34fecc2deb12f95995e3bdb7d006 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -230,6 +230,9 @@ cc_library_static {
         "libbt-audio-hal-interface",
         "libbt-stack-core",
     ],
+    shared_libs: [
+        "libcrypto",
+    ],
     cflags: [
         /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
         "-DBUILDCFG",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 22516b5efe234344637e0c735ca5e86416f623bb..0e1ef259a5ee3a4690ac17fbd9100cb865773047 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -115,9 +115,6 @@ cc_defaults {
         "//apex_available:platform",
         "com.android.btservices",
     ],
-    shared_libs: [
-        "libcrypto",
-    ],
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
         "libbt-protos-lite",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index cbf039125c415e9b692928f5d124fa66fb7d578e..fb435d95e5264e37292dc792b7eeb232d221e438 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -36,6 +36,9 @@ cc_library_static {
             srcs: ["metrics_linux.cc"],
         },
     },
+    shared_libs: [
+        "libcrypto",
+    ],
     min_sdk_version: "Tiramisu",
 }
 
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 02343a610b4005d009f45d3569be016f8088cc5d..24f80322634477754cd8dfd30950c69f3272d073 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -287,6 +287,7 @@ cc_library_static {
     ],
     shared_libs: [
         "libPlatformProperties",
+        "libcrypto",
     ],
     host_supported: true,
     min_sdk_version: "Tiramisu",