From 987e12102c7b9b76498a83067a85a9307fbb69ad Mon Sep 17 00:00:00 2001 From: chaptsand Date: Sat, 6 May 2023 00:45:44 +0800 Subject: [PATCH] sm8550-common: Build QTI bootctrl HAL Change-Id: I1d35fe73deaef39ab71dd627a17f72d60e53d717 --- Android.bp | 1 + BoardConfigCommon.mk | 5 +++++ bootctrl/Android.bp | 12 ++++++++++++ common.mk | 6 ++++++ gpt-utils/Android.bp | 11 ++--------- 5 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 bootctrl/Android.bp diff --git a/Android.bp b/Android.bp index 9515b25..dfecee0 100644 --- a/Android.bp +++ b/Android.bp @@ -1,2 +1,3 @@ soong_namespace { + imports: ["hardware/qcom-caf/bootctrl"], } diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b06f063..a51d350 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -44,6 +44,11 @@ BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_RAMDISK_USE_LZ4 := true +# Boot control +SOONG_CONFIG_NAMESPACES += ufsbsg +SOONG_CONFIG_ufsbsg += ufsframework +SOONG_CONFIG_ufsbsg_ufsframework := bsg + # Bootloader TARGET_BOOTLOADER_BOARD_NAME := kalama diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp new file mode 100644 index 0000000..1030e25 --- /dev/null +++ b/bootctrl/Android.bp @@ -0,0 +1,12 @@ +// +// Copyright (C) 2023 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_shared { + name: "android.hardware.boot@1.2-impl-qti", + stem: "android.hardware.boot@1.0-impl-1.2-qti", + defaults: ["android.hardware.boot@1.2-impl-qti_defaults"], + static_libs: ["libgptutils.samsung_sm8550"], +} diff --git a/common.mk b/common.mk index 6a55780..681c566 100644 --- a/common.mk +++ b/common.mk @@ -33,6 +33,12 @@ PRODUCT_PACKAGES += \ checkpoint_gc \ otapreopt_script +# Boot control +PRODUCT_PACKAGES += \ + android.hardware.boot@1.2-impl-qti \ + android.hardware.boot@1.2-impl-qti.recovery \ + android.hardware.boot@1.2-service + # Fastboot PRODUCT_PACKAGES += \ fastbootd diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index 0fe0fac..ced89f1 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -23,23 +23,16 @@ ufsbsg_cc_defaults { } cc_library { - name: "librecovery_updater", + name: "libgptutils.samsung_sm8550", vendor: true, recovery_available: true, - defaults: ["libion_header_paths" ,"ufsbsg_defaults"], + defaults: ["ufsbsg_defaults"], srcs: [ "gpt-utils.cpp", - "oem-updater.cpp", "recovery-ufs-bsg.cpp", ], - static_libs: [ - "libbase", - "libedify", - "libotautil", - ], shared_libs: [ "libcutils", - "libion", "liblog", "libz", ],