DO NOT MERGE: Make update_engine compile in the branch.
These changes are required to adapt the cherry-picked CLs to the
context of this branch.
Bug: 27178350
Change-Id: Ifb6be225294e5b8849daa2dce90cc952ef2dab52
diff --git a/Android.mk b/Android.mk
index c6b0f57..3f44ecc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -512,19 +512,11 @@
LOCAL_STATIC_LIBRARIES += \
$(ue_common_shared_libraries) \
libcutils \
- $(ue_libpayload_consumer_exported_shared_libraries:-host=) \
+ libcrypto_static \
$(ue_update_metadata_protos_exported_shared_libraries) \
libevent \
libmodpb64 \
- libgtest_prod
-# libchrome requires these extra LDFLAGS which are not propagated through the
-# build system.
-LOCAL_LDFLAGS += \
- -Wl,-wrap,calloc \
- -Wl,-wrap,free \
- -Wl,-wrap,malloc \
- -Wl,-wrap,memalign \
- -Wl,-wrap,realloc
+ liblog
ifeq ($(strip $(PRODUCT_STATIC_BOOT_CONTROL_HAL)),)
# No static boot_control HAL defined, so no sideload support. We use a fake
diff --git a/sideload_main.cc b/sideload_main.cc
index 46e8f35..43d0f93 100644
--- a/sideload_main.cc
+++ b/sideload_main.cc
@@ -139,7 +139,8 @@
int64_t payload_size,
const vector<string>& headers,
int64_t status_fd) {
- brillo::BaseMessageLoop loop;
+ base::MessageLoopForIO base_loop;
+ brillo::BaseMessageLoop loop(&base_loop);
loop.SetAsCurrent();
// Setup the subprocess handler.