From 189d424ceda58a0f0466f1e7c3ad93c3dca24f6f Mon Sep 17 00:00:00 2001
From: Pete Bentley <prb@google.com>
Date: Thu, 12 Sep 2019 19:53:46 +0100
Subject: Link libcrypto dynamically for recovery unit tests.

Tested by running recovery_unit_test as described in
https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/README.md

Attempted to build and boot a recovery image with the
same change to confirm it still works, but
m recoveryimage-nodeps
fails for me.

Bug: 140940227
Test: See above
Change-Id: I00545968a0e5684823e505f2ddbe7e993319b5d4
---
 applypatch/Android.bp | 10 ++++++++--
 minadbd/Android.bp    |  2 +-
 tests/Android.bp      |  1 -
 updater/Android.bp    |  5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 42aa52954..ae7e9c5cc 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -51,12 +51,15 @@ cc_library_static {
         "libbase",
         "libbspatch",
         "libbz",
-        "libcrypto",
         "libedify",
         "libotautil",
         "libz",
     ],
 
+    shared_libs: [
+        "libcrypto",
+    ],
+
     target: {
         darwin: {
             enabled: false,
@@ -78,10 +81,13 @@ cc_library_static {
     static_libs: [
         "libapplypatch",
         "libbase",
-        "libcrypto",
         "libedify",
         "libotautil",
     ],
+
+    shared_libs: [
+        "libcrypto",
+    ],
 }
 
 cc_binary {
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index afd57ad2d..805d12af3 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -102,11 +102,11 @@ cc_test {
         "libfusesideload",
         "libotautil",
         "libadbd",
-        "libcrypto",
     ],
 
     shared_libs: [
         "libbase",
+        "libcrypto",
         "libcutils",
         "liblog",
     ],
diff --git a/tests/Android.bp b/tests/Android.bp
index 8e150175c..232697d70 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -64,7 +64,6 @@ libapplypatch_static_libs = [
     "libbase",
     "libbrotli",
     "libbz",
-    "libcrypto",
     "libz",
     "libziparchive",
 ]
diff --git a/updater/Android.bp b/updater/Android.bp
index 063366e5e..872ef86db 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -41,11 +41,14 @@ cc_defaults {
         "libziparchive",
         "libz",
         "libbase",
-        "libcrypto",
         "libcrypto_utils",
         "libcutils",
         "libutils",
     ],
+
+    shared_libs: [
+        "libcrypto",
+    ],
 }
 
 cc_defaults {
-- 
cgit v1.2.3