Merge "Link libcrypto dynamically for recovery unit tests."
am: 54100d3348
Change-Id: I804ef56f77f28ce9e2d74b2227e7c26a3b6c22f2
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 {
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",
],
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",
]
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 {