Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add statically linked boot HAL impl in recovery"

Browse Source
This commit is contained in:
Connor O'Brien
2018-10-17 18:48:57 +00:00
committed by Android (Google) Code Review
parent 3f2a20daf0 ee6a0b5a8b
commit 40b0b8963b
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
boot/1.0/default/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
# TODO(connoro): Remove this file once we eliminate existing usage of
# PRODUCT_STATIC_BOOT_CONTROL_HAL
LOCAL_PATH := $(call my-dir)
ifneq ($(strip $(PRODUCT_STATIC_BOOT_CONTROL_HAL)),)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-impl-wrapper.recovery
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MULTILIB := first
ifeq ($(TARGET_IS_64_BIT),true)
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/hw
else
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/lib/hw
endif
LOCAL_SRC_FILES := BootControl.cpp
LOCAL_CFLAGS := -DBOOT_CONTROL_RECOVERY
LOCAL_SHARED_LIBRARIES := \
liblog.recovery \
libhidlbase.recovery \
libhidltransport.recovery \
libhardware.recovery \
libutils.recovery \
android.hardware.boot@1.0.recovery
LOCAL_STATIC_LIBRARIES := $(PRODUCT_STATIC_BOOT_CONTROL_HAL)
include $(BUILD_SHARED_LIBRARY)
endif

22
boot/1.0/default/BootControl.cpp
View File

@@ -21,6 +21,10 @@
#include <hardware/boot_control.h>
#include "BootControl.h"
#ifdef BOOT_CONTROL_RECOVERY
extern const hw_module_t HAL_MODULE_INFO_SYM;
#endif
namespace android {
namespace hardware {
namespace boot {
@@ -92,7 +96,23 @@ Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) {
return Void();
}
#ifdef BOOT_CONTROL_RECOVERY
IBootControl* HIDL_FETCH_IBootControl(const char * /* hal */) {
boot_control_module_t* module;
// For devices that don't build a standalone libhardware bootctrl impl for recovery,
// we simulate the hw_get_module() by accessing it from the current process directly.
const hw_module_t* hw_module = &HAL_MODULE_INFO_SYM;
if (!hw_module ||
strcmp(BOOT_CONTROL_HARDWARE_MODULE_ID, hw_module->id) != 0) {
ALOGE("Error loading boot_control HAL implementation: %d.", -EINVAL);
return nullptr;
}
module = reinterpret_cast<boot_control_module_t*>(const_cast<hw_module_t*>(hw_module));
module->init(module);
return new BootControl(module);
}
#else
IBootControl* HIDL_FETCH_IBootControl(const char* /* hal */) {
int ret = 0;
boot_control_module_t* module = NULL;
@@ -106,7 +126,7 @@ IBootControl* HIDL_FETCH_IBootControl(const char* /* hal */) {
module->init(module);
return new BootControl(module);
}
#endif
} // namespace implementation
} // namespace V1_0
} // namespace boot