diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-09-13 19:18:28 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-13 19:18:28 +0200 |
| commit | 97fee1c3b2aa743593e187ff99bad7f9da162b4f (patch) | |
| tree | f8150a45ecaead1dd656ecd0d038678a5c068236 | |
| parent | Merge "Set LOCAL_INJECT_BSSL_HASH for updater" (diff) | |
| parent | Merge "Link libcrypto dynamically for recovery unit tests." (diff) | |
| download | android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar.gz android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar.bz2 android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar.lz android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar.xz android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.tar.zst android_bootable_recovery-97fee1c3b2aa743593e187ff99bad7f9da162b4f.zip | |
| -rw-r--r-- | applypatch/Android.bp | 10 | ||||
| -rw-r--r-- | minadbd/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 1 | ||||
| -rw-r--r-- | 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 { |