From a7dd53af4be0b024b85f143b88021d13083a4e1b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 25 Nov 2025 22:54:54 +0200 Subject: [PATCH] bluejay: Fold lineage makefiles into the main ones Change-Id: Id20c69cca379a092453434b2b6848d7f7e0ba3e3 --- BoardConfigLineage.mk | 11 --------- bluejay/BoardConfig.mk | 12 +++++++--- bluejay/BoardConfigLineage.mk | 9 -------- bluejay/device-lineage.mk | 13 ----------- device-bluejay.mk | 41 +++++++++++++++++++++++++++++++++ device-lineage.mk | 43 ----------------------------------- lineage_bluejay.mk | 6 ++--- 7 files changed, 52 insertions(+), 83 deletions(-) delete mode 100644 BoardConfigLineage.mk delete mode 100644 bluejay/BoardConfigLineage.mk delete mode 100644 bluejay/device-lineage.mk delete mode 100644 device-lineage.mk diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk deleted file mode 100644 index 27d7296..0000000 --- a/BoardConfigLineage.mk +++ /dev/null @@ -1,11 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -# Kernel modules -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot)) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW))) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index ba7a2f0..833b065 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -1,5 +1,7 @@ # # SPDX-FileCopyrightText: 2020 The Android Open-Source Project +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-FileCopyrightText: The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # @@ -22,6 +24,10 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -DEVICE_PATH := device/google/bluejay -VENDOR_PATH := vendor/google/bluejay -include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +# Kernel modules +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW))) + +include $(VENDOR_PATH)/BoardConfigVendor.mk diff --git a/bluejay/BoardConfigLineage.mk b/bluejay/BoardConfigLineage.mk deleted file mode 100644 index 079522e..0000000 --- a/bluejay/BoardConfigLineage.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -include $(DEVICE_PATH)/BoardConfigLineage.mk - -include $(VENDOR_PATH)/BoardConfigVendor.mk diff --git a/bluejay/device-lineage.mk b/bluejay/device-lineage.mk deleted file mode 100644 index d4c9e10..0000000 --- a/bluejay/device-lineage.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk) - -DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage - -# Init -PRODUCT_PACKAGES += \ - init.recovery.bluejay.touch.rc diff --git a/device-bluejay.mk b/device-bluejay.mk index 47c5731..3589659 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -1,5 +1,7 @@ # # SPDX-FileCopyrightText: 2021 The Android Open-Source Project +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-FileCopyrightText: The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # @@ -9,6 +11,7 @@ TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINU TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION) DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay +DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/overlay-lineage include device/google/bluejay/sepolicy/bluejay-sepolicy.mk include device/google/gs101/device-shipping-common.mk @@ -180,3 +183,41 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluejay: 0x4108 PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=16648 + +# ANGLE - Almost Native Graphics Layer Engine +PRODUCT_PACKAGES += \ + ANGLE \ + libEGL_angle \ + libGLESv1_CM_angle \ + libGLESv2_angle + +# Dumpstate +PRODUCT_PACKAGES += \ + dump_gsc.sh + +# EUICC +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml + +# Fingerprint +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml + +# GNSS +PRODUCT_PACKAGES += \ + android.hardware.sensors-V2-ndk.vendor:64 + +# HBM +PRODUCT_PACKAGES += \ + HbmSVManagerOverlay + +# Init +PRODUCT_PACKAGES += \ + init.recovery.bluejay.touch.rc + +# Properties +TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Sensors +PRODUCT_PACKAGES += \ + sensors.dynamic_sensor_hal diff --git a/device-lineage.mk b/device-lineage.mk deleted file mode 100644 index ba7f29d..0000000 --- a/device-lineage.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute -# SPDX-License-Identifier: Apache-2.0 -# - -DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage - -# ANGLE - Almost Native Graphics Layer Engine -PRODUCT_PACKAGES += \ - ANGLE - -# EUICC -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml - -# HBM -PRODUCT_PACKAGES := \ - HbmSVManagerOverlay - -# Build necessary packages for vendor - -# Dumpstate -PRODUCT_PACKAGES += \ - dump_gsc.sh - -# Fingerprint -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml - -# GNSS -PRODUCT_PACKAGES += \ - android.hardware.sensors-V2-ndk.vendor:64 - -# Graphics -PRODUCT_PACKAGES += \ - libEGL_angle \ - libGLESv1_CM_angle \ - libGLESv2_angle - -# Sensors -PRODUCT_PACKAGES += \ - sensors.dynamic_sensor_hal diff --git a/lineage_bluejay.mk b/lineage_bluejay.mk index b69c5c3..13ce2f6 100644 --- a/lineage_bluejay.mk +++ b/lineage_bluejay.mk @@ -1,6 +1,6 @@ # -# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project -# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute +# SPDX-FileCopyrightText: The LineageOS Project +# SPDX-FileCopyrightText: The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # @@ -13,8 +13,6 @@ DEVICE_CODENAME := bluejay DEVICE_PATH := device/google/bluejay VENDOR_PATH := vendor/google/bluejay $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) -$(call inherit-product, device/google/gs101/lineage_common.mk) -$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk) # Device identifier. This must come after all inclusions PRODUCT_BRAND := google