diff --git a/AndroidProducts.mk b/AndroidProducts.mk index b343f20..abfcd4a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -25,7 +25,9 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_shiba.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \ $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ - $(LOCAL_DIR)/factory_shiba.mk + $(LOCAL_DIR)/factory_shiba.mk \ + $(LOCAL_DIR)/lineage_husky.mk \ + $(LOCAL_DIR)/lineage_shiba.mk COMMON_LUNCH_CHOICES := \ aosp_ripcurrent-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/husky/BoardConfig.mk b/husky/BoardConfig.mk index 8dbed02..dd89b41 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -59,3 +59,6 @@ include device/google/shusky/wifi/BoardConfig-wifi.mk ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -include device/google/common/etm/5_15/BoardUserdebugModules.mk endif + +DEVICE_PATH := device/google/shusky +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk diff --git a/husky/BoardConfigLineage.mk b/husky/BoardConfigLineage.mk new file mode 100644 index 0000000..996f8be --- /dev/null +++ b/husky/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/husky/device-lineage.mk b/husky/device-lineage.mk new file mode 100644 index 0000000..fd82a16 --- /dev/null +++ b/husky/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/lineage_husky.mk b/lineage_husky.mk new file mode 100644 index 0000000..839b255 --- /dev/null +++ b/lineage_husky.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 := husky +DEVICE_PATH := device/google/shusky +$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) +$(call inherit-product, device/google/zuma/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 8 Pro +PRODUCT_NAME := lineage_$(DEVICE_CODENAME) + +# Boot animation +TARGET_SCREEN_HEIGHT := 2992 +TARGET_SCREEN_WIDTH := 1344 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + BuildDesc="husky-user 15 AP3A.241005.015 12366759 release-keys" \ + BuildFingerprint=google/husky/husky:15/AP3A.241005.015/12366759:user/release-keys \ + DeviceProduct=$(DEVICE_CODENAME) diff --git a/lineage_shiba.mk b/lineage_shiba.mk new file mode 100644 index 0000000..88d76f8 --- /dev/null +++ b/lineage_shiba.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 := shiba +DEVICE_PATH := device/google/shusky +$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) +$(call inherit-product, device/google/zuma/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 8 +PRODUCT_NAME := lineage_$(DEVICE_CODENAME) + +# Boot animation +TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_WIDTH := 1080 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + BuildDesc="shiba-user 15 AP3A.241005.015 12366759 release-keys" \ + BuildFingerprint=google/shiba/shiba:15/AP3A.241005.015/12366759:user/release-keys \ + DeviceProduct=$(DEVICE_CODENAME) diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 17dd89e..f52bf41 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -55,3 +55,6 @@ include device/google/shusky/wifi/BoardConfig-wifi.mk ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -include device/google/common/etm/5_15/BoardUserdebugModules.mk endif + +DEVICE_PATH := device/google/shusky +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk diff --git a/shiba/BoardConfigLineage.mk b/shiba/BoardConfigLineage.mk new file mode 100644 index 0000000..996f8be --- /dev/null +++ b/shiba/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/shiba/device-lineage.mk b/shiba/device-lineage.mk new file mode 100644 index 0000000..fd82a16 --- /dev/null +++ b/shiba/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