From e2eae2fe74de945313a5c6f0908a84ba8760ab14 Mon Sep 17 00:00:00 2001 From: bigbiff Date: Sun, 7 Mar 2021 18:47:06 -0500 Subject: [PATCH] boot-hal: add 1.1 HAL to TWRP Change-Id: I51678c96f522e67c3681e404240dd98f6b07994e --- Android.mk | 5 +++-- etc/Android.mk | 15 +++++++++++++++ etc/init/android.hardware.boot@1.1-service.rc | 8 ++++++++ etc/init/android.hardware.boot@1.1.xml | 7 +++++++ prebuilt/Android.mk | 2 ++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 etc/init/android.hardware.boot@1.1-service.rc create mode 100644 etc/init/android.hardware.boot@1.1.xml diff --git a/Android.mk b/Android.mk index 3a57d048..9e75ba1e 100755 --- a/Android.mk +++ b/Android.mk @@ -144,8 +144,9 @@ endif ifeq ($(AB_OTA_UPDATER),true) LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 - LOCAL_SHARED_LIBRARIES += libhardware android.hardware.boot@1.0 - TWRP_REQUIRED_MODULES += libhardware android.hardware.boot@1.0-service android.hardware.boot@1.0-service.rc + LOCAL_SHARED_LIBRARIES += libhardware android.hardware.boot@1.0 android.hardware.boot@1.1 + TWRP_REQUIRED_MODULES += libhardware android.hardware.boot@1.0-service android.hardware.boot@1.0-service.rc \ + android.hardware.boot@1.1-service android.hardware.boot@1.1-service.rc android.hardware.boot@1.1.xml endif ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) diff --git a/etc/Android.mk b/etc/Android.mk index 3fe45c49..a5b4a848 100755 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -73,7 +73,22 @@ ifeq ($(AB_OTA_UPDATER),true) LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc/init + LOCAL_SRC_FILES := init/$(LOCAL_MODULE) + include $(BUILD_PREBUILT) + include $(CLEAR_VARS) + LOCAL_MODULE := android.hardware.boot@1.1-service.rc + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_CLASS := EXECUTABLES + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc/init + LOCAL_SRC_FILES := init/$(LOCAL_MODULE) + include $(BUILD_PREBUILT) + + include $(CLEAR_VARS) + LOCAL_MODULE := android.hardware.boot@1.1.xml + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_CLASS := EXECUTABLES + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/vintf/manifest LOCAL_SRC_FILES := init/$(LOCAL_MODULE) include $(BUILD_PREBUILT) endif diff --git a/etc/init/android.hardware.boot@1.1-service.rc b/etc/init/android.hardware.boot@1.1-service.rc new file mode 100644 index 00000000..af3b5055 --- /dev/null +++ b/etc/init/android.hardware.boot@1.1-service.rc @@ -0,0 +1,8 @@ +on post-fs + start boot-hal-1-1 + +service boot-hal-1-1 /system/bin/android.hardware.boot@1.1-service + user root + group root + disabled + seclabel u:r:recovery:s0 diff --git a/etc/init/android.hardware.boot@1.1.xml b/etc/init/android.hardware.boot@1.1.xml new file mode 100644 index 00000000..83d5d2e8 --- /dev/null +++ b/etc/init/android.hardware.boot@1.1.xml @@ -0,0 +1,7 @@ + + + android.hardware.boot + hwbinder + @1.1::IBootControl/default + + diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index f3943ba8..07fbc041 100755 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -79,6 +79,7 @@ RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/hwservicemanager RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/servicemanager RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/vold_prepare_subdirs RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_VENDOR_EXECUTABLES)/hw/android.hardware.boot@1.0-service +RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_VENDOR_EXECUTABLES)/hw/android.hardware.boot@1.1-service RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_VENDOR_EXECUTABLES)/vndservicemanager RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/toybox RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_VENDOR_EXECUTABLES)/hw/android.hardware.health@2.0-service @@ -225,6 +226,7 @@ endif ifeq ($(AB_OTA_UPDATER), true) RECOVERY_BINARY_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/bin/update_engine_sideload RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.boot@1.0.so + RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.boot@1.1.so RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/bootctl endif