diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ce06e54..08a14a2 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -36,7 +36,9 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_whitefin_pkvm.mk \ $(LOCAL_DIR)/aosp_whitefin_hwasan.mk \ $(LOCAL_DIR)/aosp_whitefin_64.mk \ - $(LOCAL_DIR)/factory_whitefin.mk + $(LOCAL_DIR)/factory_whitefin.mk \ + $(LOCAL_DIR)/lineage_oriole.mk \ + $(LOCAL_DIR)/lineage_raven.mk COMMON_LUNCH_CHOICES := \ aosp_slider-trunk_staging-userdebug \ diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk new file mode 100644 index 0000000..eadedb9 --- /dev/null +++ b/BoardConfigLineage.mk @@ -0,0 +1,5 @@ +# +# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project +# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute +# SPDX-License-Identifier: Apache-2.0 +# diff --git a/device-lineage.mk b/device-lineage.mk new file mode 100644 index 0000000..dc6adb4 --- /dev/null +++ b/device-lineage.mk @@ -0,0 +1,7 @@ +# +# 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 diff --git a/lineage_oriole.mk b/lineage_oriole.mk new file mode 100644 index 0000000..db1af2a --- /dev/null +++ b/lineage_oriole.mk @@ -0,0 +1,30 @@ +# +# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project +# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit some common stuff +TARGET_DISABLE_EPPE := true +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) + +# Inherit device configuration +DEVICE_CODENAME := oriole +DEVICE_PATH := device/google/raviole +$(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 +PRODUCT_MODEL := Pixel 6 +PRODUCT_NAME := lineage_$(DEVICE_CODENAME) + +# Boot animation +TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_WIDTH := 1080 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + BuildDesc="oriole-user 15 AP3A.241005.015 12366759 release-keys" \ + BuildFingerprint=google/oriole/oriole:15/AP3A.241005.015/12366759:user/release-keys \ + DeviceProduct=$(DEVICE_CODENAME) diff --git a/lineage_raven.mk b/lineage_raven.mk new file mode 100644 index 0000000..3bb0c28 --- /dev/null +++ b/lineage_raven.mk @@ -0,0 +1,30 @@ +# +# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project +# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit some common stuff +TARGET_DISABLE_EPPE := true +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) + +# Inherit device configuration +DEVICE_CODENAME := raven +DEVICE_PATH := device/google/raviole +$(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 +PRODUCT_MODEL := Pixel 6 Pro +PRODUCT_NAME := lineage_$(DEVICE_CODENAME) + +# Boot animation +TARGET_SCREEN_HEIGHT := 3120 +TARGET_SCREEN_WIDTH := 1440 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + BuildDesc="raven-user 15 AP3A.241005.015 12366759 release-keys" \ + BuildFingerprint=google/raven/raven:15/AP3A.241005.015/12366759:user/release-keys \ + DeviceProduct=$(DEVICE_CODENAME) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 6706548..c007b3b 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -48,3 +48,6 @@ include device/google/gs101/sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk + +DEVICE_PATH := device/google/raviole +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk diff --git a/oriole/BoardConfigLineage.mk b/oriole/BoardConfigLineage.mk new file mode 100644 index 0000000..996f8be --- /dev/null +++ b/oriole/BoardConfigLineage.mk @@ -0,0 +1,7 @@ +# +# 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 diff --git a/oriole/device-lineage.mk b/oriole/device-lineage.mk new file mode 100644 index 0000000..fd82a16 --- /dev/null +++ b/oriole/device-lineage.mk @@ -0,0 +1,9 @@ +# +# 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 diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 7d61131..c4abe84 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -48,3 +48,6 @@ include device/google/gs101/sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk + +DEVICE_PATH := device/google/raviole +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk diff --git a/raven/BoardConfigLineage.mk b/raven/BoardConfigLineage.mk new file mode 100644 index 0000000..996f8be --- /dev/null +++ b/raven/BoardConfigLineage.mk @@ -0,0 +1,7 @@ +# +# 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 diff --git a/raven/device-lineage.mk b/raven/device-lineage.mk new file mode 100644 index 0000000..fd82a16 --- /dev/null +++ b/raven/device-lineage.mk @@ -0,0 +1,9 @@ +# +# 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