Merge "Update the instruction for building recovery image on Pixels."
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/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp
index fa7dc47..89cf878 100644
--- a/boot_control/libboot_control.cpp
+++ b/boot_control/libboot_control.cpp
@@ -204,10 +204,16 @@
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 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 {
diff --git a/updater/Android.mk b/updater/Android.mk
index 93525c1..bc766c4 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -109,6 +109,7 @@
inc :=
LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_INJECT_BSSL_HASH := true
include $(BUILD_EXECUTABLE)