commit 54100d334880eee98cf435a1f190c1034d89b0e0
author Tobias Thierer <tobiast@google.com> Fri Sep 13 16:56:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 13 16:56:06 2019 +0000
tree f8150a45ecaead1dd656ecd0d038678a5c068236
parent 0af65d8c4a800a1e0453992ab70f73dccd92bfef
parent 189d424ceda58a0f0466f1e7c3ad93c3dca24f6f

Merge "Link libcrypto dynamically for recovery unit tests."

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 42aa529..ae7e9c5 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -51,12 +51,15 @@
         "libbase",
         "libbspatch",
         "libbz",
-        "libcrypto",
         "libedify",
         "libotautil",
         "libz",
     ],
 
+    shared_libs: [
+        "libcrypto",
+    ],
+
     target: {
         darwin: {
             enabled: false,
@@ -78,10 +81,13 @@
     static_libs: [
         "libapplypatch",
         "libbase",
-        "libcrypto",
         "libedify",
         "libotautil",
     ],
+
+    shared_libs: [
+        "libcrypto",
+    ],
 }
 
 cc_binary {

minadbd/Android.bp

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index afd57ad..805d12a 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -102,11 +102,11 @@
         "libfusesideload",
         "libotautil",
         "libadbd",
-        "libcrypto",
     ],
 
     shared_libs: [
         "libbase",
+        "libcrypto",
         "libcutils",
         "liblog",
     ],

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 8e15017..232697d 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -64,7 +64,6 @@
     "libbase",
     "libbrotli",
     "libbz",
-    "libcrypto",
     "libz",
     "libziparchive",
 ]

updater/Android.bp

diff --git a/updater/Android.bp b/updater/Android.bp
index 063366e..872ef86 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -41,11 +41,14 @@
         "libziparchive",
         "libz",
         "libbase",
-        "libcrypto",
         "libcrypto_utils",
         "libcutils",
         "libutils",
     ],
+
+    shared_libs: [
+        "libcrypto",
+    ],
 }
 
 cc_defaults {