Merge "Link libcrypto dynamically for recovery unit tests."

am: 54100d3348

Change-Id: I804ef56f77f28ce9e2d74b2227e7c26a3b6c22f2

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 {

minadbd/Android.bp

@@ -102,11 +102,11 @@ cc_test {
         "libfusesideload",
         "libotautil",
         "libadbd",
-        "libcrypto",
     ],
 
     shared_libs: [
         "libbase",
+        "libcrypto",
         "libcutils",
         "liblog",
     ],

tests/Android.bp

@@ -64,7 +64,6 @@ libapplypatch_static_libs = [
     "libbase",
     "libbrotli",
     "libbz",
-    "libcrypto",
     "libz",
     "libziparchive",
 ]

updater/Android.bp

@@ -41,11 +41,14 @@ cc_defaults {
         "libziparchive",
         "libz",
         "libbase",
-        "libcrypto",
         "libcrypto_utils",
         "libcutils",
         "libutils",
     ],
+
+    shared_libs: [
+        "libcrypto",
+    ],
 }
 
 cc_defaults {