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/device-lineage.mk b/device-lineage.mk deleted file mode 100644 index 4cf2540..0000000 --- a/device-lineage.mk +++ /dev/null @@ -1,45 +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 - -# PowerShare -include hardware/google/pixel/powershare/device.mk - -# wireless_charger HAL service -include device/google/gs-common/wireless_charger/wireless_charger.mk - -# 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/device-oriole.mk b/device-oriole.mk index 58d6662..ee40a2e 100644 --- a/device-oriole.mk +++ b/device-oriole.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 # @@ -9,6 +11,8 @@ 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/raviole/oriole/overlay +DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay-lineage +DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage include device/google/gs101/device-shipping-common.mk include device/google/gs-common/bcmbt/bluetooth.mk @@ -176,3 +180,47 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Oriole: 0x4106 PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=16646 + +# 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.oriole.touch.rc + +# PowerShare +include hardware/google/pixel/powershare/device.mk + +# Properties +TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Sensors +PRODUCT_PACKAGES += \ + sensors.dynamic_sensor_hal + +# Wireless charging +include device/google/gs-common/wireless_charger/wireless_charger.mk diff --git a/device-raven.mk b/device-raven.mk index 122c927..a227078 100644 --- a/device-raven.mk +++ b/device-raven.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 # @@ -9,6 +11,8 @@ 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/raviole/raven/overlay +DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay-lineage +DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage include device/google/gs101/device-shipping-common.mk include device/google/gs-common/bcmbt/bluetooth.mk @@ -189,3 +193,43 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Raven: 0x4107 PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=16647 + +# 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 + +# Init +PRODUCT_PACKAGES += \ + init.recovery.raven.touch.rc + +# PowerShare +include hardware/google/pixel/powershare/device.mk + +# Properties +TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Sensors +PRODUCT_PACKAGES += \ + sensors.dynamic_sensor_hal + +# Wireless charging +include device/google/gs-common/wireless_charger/wireless_charger.mk diff --git a/lineage_oriole.mk b/lineage_oriole.mk index da6046b..12561e3 100644 --- a/lineage_oriole.mk +++ b/lineage_oriole.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 := oriole DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/oriole $(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 diff --git a/lineage_raven.mk b/lineage_raven.mk index 25b1aff..61e390e 100644 --- a/lineage_raven.mk +++ b/lineage_raven.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 := raven DEVICE_PATH := device/google/raviole VENDOR_PATH := vendor/google/raven $(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 diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 7b62988..9b09a81 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/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 # @@ -23,6 +25,10 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -DEVICE_PATH := device/google/raviole -VENDOR_PATH := vendor/google/oriole -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/oriole/BoardConfigLineage.mk b/oriole/BoardConfigLineage.mk deleted file mode 100644 index 079522e..0000000 --- a/oriole/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/oriole/device-lineage.mk b/oriole/device-lineage.mk deleted file mode 100644 index 590a69c..0000000 --- a/oriole/device-lineage.mk +++ /dev/null @@ -1,17 +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 - -# HBM -PRODUCT_PACKAGES += \ - HbmSVManagerOverlay - -# Init -PRODUCT_PACKAGES += \ - init.recovery.oriole.touch.rc diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index a330c7f..1570ec7 100644 --- a/raven/BoardConfig.mk +++ b/raven/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 # @@ -23,6 +25,10 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101/sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -DEVICE_PATH := device/google/raviole -VENDOR_PATH := vendor/google/raven -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/raven/BoardConfigLineage.mk b/raven/BoardConfigLineage.mk deleted file mode 100644 index 079522e..0000000 --- a/raven/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/raven/device-lineage.mk b/raven/device-lineage.mk deleted file mode 100644 index d16c57c..0000000 --- a/raven/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.raven.touch.rc