otter: add full target
This allows inheriting from full_otter.mk to deduplicate more
properties for non-lineage builds.
Change-Id: Ibbf1fd55bbdb47aca637c833cf1a5dc02c82d6d2
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/device.mk b/device.mk
index bbf2dcd..1a684e7 100644
--- a/device.mk
+++ b/device.mk
@@ -3,6 +3,10 @@
# SPDX-License-Identifier: Apache-2.0
#
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
# Add common definitions for Qualcomm
$(call inherit-product, hardware/qcom-caf/common/common.mk)
@@ -88,6 +92,10 @@
# Board API level
BOARD_SHIPPING_API_LEVEL := 30
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2400
+TARGET_SCREEN_WIDTH := 1080
+
# Boot control
PRODUCT_PACKAGES += \
android.hardware.boot@1.1-impl-qti \
diff --git a/full_otter.mk b/full_otter.mk
new file mode 100644
index 0000000..2143347
--- /dev/null
+++ b/full_otter.mk
@@ -0,0 +1,16 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2024 SHIFT GmbH
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit from otter device.
+$(call inherit-product, device/shift/otter/device.mk)
+
+PRODUCT_NAME := full_otter
+PRODUCT_DEVICE := otter
+PRODUCT_BRAND := SHIFT
+PRODUCT_MODEL := SHIFTphone 8
+PRODUCT_MANUFACTURER := SHIFT
+
+PRODUCT_GMS_CLIENTID_BASE := android-uniscope
diff --git a/lineage_otter.mk b/lineage_otter.mk
index 3e631a7..e75f196 100644
--- a/lineage_otter.mk
+++ b/lineage_otter.mk
@@ -3,28 +3,14 @@
# SPDX-License-Identifier: Apache-2.0
#
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
-# Inherit from otter device
-$(call inherit-product, device/shift/otter/device.mk)
+# Inherit from full device.
+$(call inherit-product, device/shift/otter/full_otter.mk)
# Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-# Boot animation
-TARGET_SCREEN_HEIGHT := 2400
-TARGET_SCREEN_WIDTH := 1080
-
-# Device identifier. This must come after all inclusions.
+# Override product name for Lineage.
PRODUCT_NAME := lineage_otter
-PRODUCT_DEVICE := otter
-PRODUCT_BRAND := SHIFT
-PRODUCT_MODEL := SHIFTphone 8
-PRODUCT_MANUFACTURER := SHIFT
-
-PRODUCT_GMS_CLIENTID_BASE := android-uniscope
PRODUCT_BUILD_PROP_OVERRIDES += \
BuildFingerprint=SHIFT/otter/otter:14/SOS.6.0.20241030/20241030:user/release-keys \