From ac48b0b8dc5858d254636de02541dbc74f014de1 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 28 Nov 2025 13:47:47 +0200 Subject: [PATCH] gs101: Fold lineage makefiles into the main ones Change-Id: Id20c69cca379a092453434b2b6848d7f7e0ba3e3 --- BoardConfig-common.mk | 36 +++++++++++++++++++++++++++------ BoardConfigLineage.mk | 33 ------------------------------- device.mk | 37 ++++++++++++++++++++++++++++++++++ lineage_common.mk | 46 ------------------------------------------- manifest.xml | 24 ++++++++++++++++++++++ manifest_radio.xml | 26 ------------------------ 6 files changed, 91 insertions(+), 111 deletions(-) delete mode 100644 BoardConfigLineage.mk delete mode 100644 lineage_common.mk delete mode 100644 manifest_radio.xml diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index c9e9adce..d9eefcda 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -1,7 +1,10 @@ # # SPDX-FileCopyrightText: 2019 The Android Open-Source Project +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-FileCopyrightText: The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # + include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk @@ -47,10 +50,13 @@ TARGET_RECOVERY_UI_LIB := \ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ - system \ - system_ext \ - product \ - vbmeta_system + system \ + system_ext \ + product \ + vbmeta_system \ + vbmeta_vendor \ + vendor \ + vendor_dlkm ifneq ($(PRODUCT_BUILD_BOOT_IMAGE),false) AB_OTA_PARTITIONS += boot @@ -83,6 +89,16 @@ BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048 BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2 +# Enable chain partition for vendor. +BOARD_AVB_VBMETA_VENDOR := vendor +BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) +BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3 + +# Verified Boot +BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 + TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true BOARD_USERDATAIMAGE_PARTITION_SIZE := 11796480000 @@ -97,6 +113,13 @@ TARGET_COPY_OUT_PRODUCT := product BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext +# vendor.img +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 + +# vendor_dlkm.img +BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm + BOARD_SUPER_PARTITION_SIZE := 8531214336 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions # Set size to BOARD_SUPER_PARTITION_SIZE - overhead (4MiB) (b/182237294) @@ -111,6 +134,9 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ # Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936 +# Reserve space for gapps install +-include vendor/lineage/config/BoardConfigReservedSize.mk + # Device Tree BOARD_INCLUDE_DTB_IN_BOOTIMG := true BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR) @@ -191,5 +217,3 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 - -include device/google/gs101/BoardConfigLineage.mk diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk deleted file mode 100644 index 33a7f2e0..00000000 --- a/BoardConfigLineage.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -# Manifests -DEVICE_MANIFEST_FILE += device/google/gs101/manifest_radio.xml - -# Partitions -AB_OTA_PARTITIONS += \ - vendor \ - vendor_dlkm - -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm - -# Enable chain partition for vendor. -BOARD_AVB_VBMETA_VENDOR := vendor -BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048 -BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3 - -AB_OTA_PARTITIONS += \ - vbmeta_vendor - -# Reserve space for gapps install --include vendor/lineage/config/BoardConfigReservedSize.mk - -# Verified Boot -BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 diff --git a/device.mk b/device.mk index 35bc3610..f31f46e7 100644 --- a/device.mk +++ b/device.mk @@ -1,5 +1,7 @@ # # SPDX-FileCopyrightText: 2011 The Android Open-Source Project +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-FileCopyrightText: The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # @@ -172,6 +174,7 @@ DEVICE_MATRIX_FILE := \ device/google/gs101/compatibility_matrix.xml DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay +DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay-lineage # Enforce the Product interface PRODUCT_PRODUCT_VNDK_VERSION := current @@ -585,3 +588,37 @@ include device/google/gs-common/touch/twoshay/twoshay.mk # since it can't be overridden from /vendor. PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false + +# AiAi Config +PRODUCT_COPY_FILES += \ + device/google/gs101/allowlist_com.google.android.as.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/allowlist_com.google.android.as.xml + +# Camera +PRODUCT_PRODUCT_PROPERTIES += \ + ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \ + ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions + +# Google Assistant +PRODUCT_PRODUCT_PROPERTIES += ro.opa.eligible_device=true + +# Lineage Health +include hardware/google/pixel/lineage_health/device.mk + +$(call soong_config_set,lineage_health,charging_control_supports_deadline,true) +$(call soong_config_set,lineage_health,charging_control_supports_limit,true) +$(call soong_config_set,lineage_health,charging_control_supports_toggle,false) + +# Linker config +PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \ + device/google/gs101/linker.config.json + +# Parts +PRODUCT_PACKAGES += \ + GoogleParts + +# Tethering +PRODUCT_PACKAGES += \ + TetheringOverlay + +# Touch +include hardware/google/pixel/touch/device.mk diff --git a/lineage_common.mk b/lineage_common.mk deleted file mode 100644 index 91c880d3..00000000 --- a/lineage_common.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -# Overlays -DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay-lineage - -# AiAi Config -PRODUCT_COPY_FILES += \ - device/google/gs101/allowlist_com.google.android.as.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/allowlist_com.google.android.as.xml - -# Camera -PRODUCT_PRODUCT_PROPERTIES += \ - ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \ - ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions - -# Google Assistant -PRODUCT_PRODUCT_PROPERTIES += ro.opa.eligible_device=true - -# EUICC -PRODUCT_PACKAGES += \ - EuiccSupportPixelOverlay - -# Lineage Health -include hardware/google/pixel/lineage_health/device.mk - -$(call soong_config_set,lineage_health,charging_control_supports_deadline,true) -$(call soong_config_set,lineage_health,charging_control_supports_limit,true) -$(call soong_config_set,lineage_health,charging_control_supports_toggle,false) - -# Linker config -PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \ - device/google/gs101/linker.config.json - -# Parts -PRODUCT_PACKAGES += \ - GoogleParts - -# Tethering -PRODUCT_PACKAGES += \ - TetheringOverlay - -# Touch -include hardware/google/pixel/touch/device.mk diff --git a/manifest.xml b/manifest.xml index 05b09ddc..c76c9a65 100644 --- a/manifest.xml +++ b/manifest.xml @@ -25,5 +25,29 @@ android.hardware.boot IBootControl/default + + android.hardware.radio + hwbinder + @1.2::ISap/slot1 + @1.2::ISap/slot2 + @1.6::IRadio/slot1 + @1.6::IRadio/slot2 + + + android.hardware.radio.config + hwbinder + @1.1::IRadioConfig/default + + + android.hardware.secure_element + hwbinder + @1.2::ISecureElement/SIM1 + @1.2::ISecureElement/SIM2 + + + vendor.samsung_slsi.telephony.hardware.radioExternal + hwbinder + @1.1::IOemSlsiRadioExternal/rilExternal + diff --git a/manifest_radio.xml b/manifest_radio.xml deleted file mode 100644 index c2554b03..00000000 --- a/manifest_radio.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - android.hardware.radio - hwbinder - @1.2::ISap/slot1 - @1.2::ISap/slot2 - @1.6::IRadio/slot1 - @1.6::IRadio/slot2 - - - android.hardware.radio.config - hwbinder - @1.1::IRadioConfig/default - - - android.hardware.secure_element - hwbinder - @1.2::ISecureElement/SIM1 - @1.2::ISecureElement/SIM2 - - - vendor.samsung_slsi.telephony.hardware.radioExternal - hwbinder - @1.1::IOemSlsiRadioExternal/rilExternal - -