diff options
| -rw-r--r-- | applypatch/Android.bp | 10 | ||||
| -rw-r--r-- | boot_control/libboot_control.cpp | 10 | ||||
| -rw-r--r-- | minadbd/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 1 | ||||
| -rw-r--r-- | updater/Android.bp | 5 | ||||
| -rw-r--r-- | updater/Android.mk | 1 |
6 files changed, 22 insertions, 7 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/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp index fa7dc47ef..89cf8786a 100644 --- a/boot_control/libboot_control.cpp +++ b/boot_control/libboot_control.cpp @@ -204,10 +204,16 @@ bool BootControl::Init() { std::string err; std::string device = get_bootloader_message_blk_device(&err); - if (device.empty()) return false; + if (device.empty()) { + LOG(ERROR) << "Could not find bootloader message block device: " << err; + return false; + } bootloader_control boot_ctrl; - if (!LoadBootloaderControl(device.c_str(), &boot_ctrl)) return false; + if (!LoadBootloaderControl(device.c_str(), &boot_ctrl)) { + LOG(ERROR) << "Failed to load bootloader control block"; + return false; + } // Note that since there isn't a module unload function this memory is leaked. misc_device_ = strdup(device.c_str()); 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 { diff --git a/updater/Android.mk b/updater/Android.mk index 93525c12a..bc766c453 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -109,6 +109,7 @@ LOCAL_GENERATED_SOURCES := $(inc) inc := LOCAL_FORCE_STATIC_EXECUTABLE := true +LOCAL_INJECT_BSSL_HASH := true include $(BUILD_EXECUTABLE) |