Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348

am: 97fee1c3b2 Change-Id: I1c839029b1e967234d1c181eb30b9638a42cd4e3
2019-09-13 10:32:42 -07:00
parent 9254aea083 97fee1c3b2
commit 5ece6250f0
4 changed files with 13 additions and 5 deletions
--- 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 {
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -102,11 +102,11 @@ cc_test {
        "libfusesideload",
        "libotautil",
        "libadbd",
-        "libcrypto",
    ],

    shared_libs: [
        "libbase",
+        "libcrypto",
        "libcutils",
        "liblog",
    ],
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -64,7 +64,6 @@ libapplypatch_static_libs = [
    "libbase",
    "libbrotli",
    "libbz",
-    "libcrypto",
    "libz",
    "libziparchive",
 ]
--- 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 {