Revert "Convert BootControl HAL to binder."
This reverts commit 29dcbf32a88f1638bb911c86b8e0ea12f84d9364.
Bug: 32973182
Change-Id: I284737db77ff1c140a0abf0c364551d4139c8914
diff --git a/Android.mk b/Android.mk
index a56a81b..263f840 100644
--- a/Android.mk
+++ b/Android.mk
@@ -235,41 +235,6 @@
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)
@@ -285,19 +250,17 @@
libbz \
libfs_mgr \
$(ue_libpayload_consumer_exported_static_libraries) \
- $(ue_update_metadata_protos_exported_static_libraries) \
- libupdate_engine_boot_control \
- $(ue_libupdate_engine_boot_control_exported_static_libraries)
+ $(ue_update_metadata_protos_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_libupdate_engine_boot_control_exported_shared_libraries)
+ $(ue_update_metadata_protos_exported_shared_libraries)
ifeq ($(local_use_dbus),1)
ue_libupdate_engine_exported_static_libraries += \
update_engine-dbus-adaptor \
@@ -352,6 +315,7 @@
$(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 \
@@ -433,18 +397,16 @@
ue_libupdate_engine_android_exported_static_libraries := \
libpayload_consumer \
libfs_mgr \
- $(ue_libpayload_consumer_exported_static_libraries) \
- libupdate_engine_boot_control \
- $(ue_libupdate_engine_boot_control_exported_static_libraries)
+ $(ue_libpayload_consumer_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
@@ -474,6 +436,7 @@
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 \
@@ -559,7 +522,7 @@
LOCAL_C_INCLUDES += \
external/cros/system_api/dbus
LOCAL_SRC_FILES := \
- boot_control_recovery.cc \
+ boot_control_android.cc \
hardware_android.cc \
network_selector_stub.cc \
proxy_resolver.cc \