Convert BootControl HAL to binder.
The new HAL specification uses HIDL to communicate between the caller
and the HAL code itself, which is now what the BootControlAndroid
implementation does. Nevertheless, since update_engine_sideload uses
the boot_control HAL directly as a static library this patch keeps the
old implementation around, now called BootControlRecovery for this
purpose.
Bug: 31863957
Test: Applied an update on master.
Change-Id: Ib2f0c4f0c616e76d19cc78b9b7e44bc55aec8ffa
diff --git a/Android.mk b/Android.mk
index 263f840..a56a81b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -235,6 +235,41 @@
LOCAL_SRC_FILES := $(ue_libpayload_consumer_src_files)
include $(BUILD_STATIC_LIBRARY)
+# libupdate_engine_boot_control (type: static_library)
+# ========================================================
+# A BootControl class implementation using Android's HIDL boot_control HAL.
+ue_libupdate_engine_boot_control_exported_static_libraries := \
+ update_metadata-protos \
+ $(ue_update_metadata_protos_exported_static_libraries)
+
+ue_libupdate_engine_boot_control_exported_shared_libraries := \
+ libhwbinder \
+ libhidl \
+ libutils \
+ android.hardware.boot@1.0 \
+ $(ue_update_metadata_protos_exported_shared_libraries)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libupdate_engine_boot_control
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_CLANG := true
+LOCAL_CFLAGS := $(ue_common_cflags)
+LOCAL_CPPFLAGS := $(ue_common_cppflags)
+LOCAL_LDFLAGS := $(ue_common_ldflags)
+LOCAL_C_INCLUDES := \
+ $(ue_common_c_includes) \
+ bootable/recovery
+LOCAL_STATIC_LIBRARIES := \
+ $(ue_common_static_libraries) \
+ $(ue_libupdate_engine_boot_control_exported_static_libraries)
+LOCAL_SHARED_LIBRARIES := \
+ $(ue_common_shared_libraries) \
+ $(ue_libupdate_engine_boot_control_exported_shared_libraries)
+LOCAL_SRC_FILES := \
+ boot_control_android.cc
+include $(BUILD_STATIC_LIBRARY)
+
ifeq ($(local_use_omaha),1)
# libupdate_engine (type: static_library)
@@ -250,17 +285,19 @@
libbz \
libfs_mgr \
$(ue_libpayload_consumer_exported_static_libraries) \
- $(ue_update_metadata_protos_exported_static_libraries)
+ $(ue_update_metadata_protos_exported_static_libraries) \
+ libupdate_engine_boot_control \
+ $(ue_libupdate_engine_boot_control_exported_static_libraries)
ue_libupdate_engine_exported_shared_libraries := \
libmetrics \
libexpat \
libbrillo-policy \
- libhardware \
libcurl \
libcutils \
libssl \
$(ue_libpayload_consumer_exported_shared_libraries) \
- $(ue_update_metadata_protos_exported_shared_libraries)
+ $(ue_update_metadata_protos_exported_shared_libraries) \
+ $(ue_libupdate_engine_boot_control_exported_shared_libraries)
ifeq ($(local_use_dbus),1)
ue_libupdate_engine_exported_static_libraries += \
update_engine-dbus-adaptor \
@@ -315,7 +352,6 @@
$(ue_libpayload_consumer_exported_shared_libraries:-host=) \
$(ue_update_metadata_protos_exported_shared_libraries)
LOCAL_SRC_FILES := \
- boot_control_android.cc \
certificate_checker.cc \
common_service.cc \
connection_utils.cc \
@@ -397,16 +433,18 @@
ue_libupdate_engine_android_exported_static_libraries := \
libpayload_consumer \
libfs_mgr \
- $(ue_libpayload_consumer_exported_static_libraries)
+ $(ue_libpayload_consumer_exported_static_libraries) \
+ libupdate_engine_boot_control \
+ $(ue_libupdate_engine_boot_control_exported_static_libraries)
ue_libupdate_engine_android_exported_shared_libraries := \
$(ue_libpayload_consumer_exported_shared_libraries) \
+ $(ue_libupdate_engine_boot_control_exported_shared_libraries) \
libandroid \
libbinder \
libbinderwrapper \
libbrillo-binder \
libcutils \
libcurl \
- libhardware \
libssl \
libutils
@@ -436,7 +474,6 @@
binder_bindings/android/os/IUpdateEngine.aidl \
binder_bindings/android/os/IUpdateEngineCallback.aidl \
binder_service_android.cc \
- boot_control_android.cc \
certificate_checker.cc \
daemon.cc \
daemon_state_android.cc \
@@ -522,7 +559,7 @@
LOCAL_C_INCLUDES += \
external/cros/system_api/dbus
LOCAL_SRC_FILES := \
- boot_control_android.cc \
+ boot_control_recovery.cc \
hardware_android.cc \
network_selector_stub.cc \
proxy_resolver.cc \