From 17f6024f9e9eb7448939419b1b6b298184456811 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 29 Dec 2016 08:58:05 -0600 Subject: [PATCH] marlin/sailfish: initial lineage bringup This is a squash of the following changes: Author: Dan Pasanen Date: Thu Dec 29 08:58:05 2016 -0600 marlin/sailfish: initial lineage bringup Change-Id: I33e512ffe3395a8263d22456e2fb37dba9b8bca8 Author: Bruno Martins Date: Fri Aug 10 13:34:48 2018 +0100 marlin: Consider lineage_marlin product via the AOSP way Change-Id: If4e63de0e6e4150f086a8a912a0e9b2ec161492d Author: razorloves Date: Tue Apr 3 19:28:39 2018 -0500 marlin: set build fingerprint instead of override Change-Id: Ifdd9a40db6bfad2b4a04c989e158ed7d6a0da19b Author: razorloves Date: Tue Aug 14 23:53:31 2018 -0500 sailfish: Add sailfish lineage mk in marlin repo Change-Id: Ifc54834c0e3ee570c6d106b8fb5011a91c19a80d Change-Id: I33e512ffe3395a8263d22456e2fb37dba9b8bca8 --- AndroidProducts.mk | 4 +++- BoardConfigLineage.mk | 3 +++ device-lineage.mk | 2 ++ lineage.dependencies | 6 ++++++ lineage_marlin.mk | 26 ++++++++++++++++++++++++++ lineage_sailfish.mk | 26 ++++++++++++++++++++++++++ marlin/BoardConfig.mk | 3 +++ marlin/BoardConfigLineage.mk | 2 ++ marlin/device-lineage.mk | 1 + sailfish/BoardConfig.mk | 3 +++ sailfish/BoardConfigLineage.mk | 2 ++ sailfish/device-lineage.mk | 1 + 12 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 BoardConfigLineage.mk create mode 100644 device-lineage.mk create mode 100644 lineage.dependencies create mode 100644 lineage_marlin.mk create mode 100644 lineage_sailfish.mk create mode 100644 marlin/BoardConfigLineage.mk create mode 100644 marlin/device-lineage.mk create mode 100644 sailfish/BoardConfigLineage.mk create mode 100644 sailfish/device-lineage.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ca1e01c48..78b59108c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,6 +1,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_marlin.mk \ - $(LOCAL_DIR)/aosp_sailfish.mk + $(LOCAL_DIR)/aosp_sailfish.mk \ + $(LOCAL_DIR)/lineage_marlin.mk \ + $(LOCAL_DIR)/lineage_sailfish.mk COMMON_LUNCH_CHOICES := \ aosp_marlin-userdebug \ diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk new file mode 100644 index 000000000..71a1e6f55 --- /dev/null +++ b/BoardConfigLineage.mk @@ -0,0 +1,3 @@ +# Common board config for marlin, sailfish + +-include vendor/google/marlin/BoardConfigVendor.mk diff --git a/device-lineage.mk b/device-lineage.mk new file mode 100644 index 000000000..cc2c843bc --- /dev/null +++ b/device-lineage.mk @@ -0,0 +1,2 @@ +# Overlays +DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-lineage diff --git a/lineage.dependencies b/lineage.dependencies new file mode 100644 index 000000000..4c6fc10ed --- /dev/null +++ b/lineage.dependencies @@ -0,0 +1,6 @@ +[ + { + "repository": "android_kernel_google_marlin", + "target_path": "kernel/google/marlin" + } +] diff --git a/lineage_marlin.mk b/lineage_marlin.mk new file mode 100644 index 000000000..0ef1434fa --- /dev/null +++ b/lineage_marlin.mk @@ -0,0 +1,26 @@ +# Boot animation +TARGET_SCREEN_HEIGHT := 2560 +TARGET_SCREEN_WIDTH := 1440 + +# Inherit some common Lineage stuff. +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/google/marlin/aosp_marlin.mk) + +-include device/google/marlin/marlin/device-lineage.mk + +## Device identifier. This must come after all inclusions +PRODUCT_NAME := lineage_marlin +PRODUCT_BRAND := google +PRODUCT_MODEL := Pixel XL +TARGET_MANUFACTURER := HTC +PRODUCT_RESTRICT_VENDOR_FILES := false + +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=marlin \ + PRIVATE_BUILD_DESC="marlin-user 10 QP1A.190711.020 5800535 release-keys" + +BUILD_FINGERPRINT := google/marlin/marlin:10/QP1A.190711.020/5800535:user/release-keys + +$(call inherit-product-if-exists, vendor/google/marlin/marlin-vendor.mk) diff --git a/lineage_sailfish.mk b/lineage_sailfish.mk new file mode 100644 index 000000000..58c8328d6 --- /dev/null +++ b/lineage_sailfish.mk @@ -0,0 +1,26 @@ +# Boot animation +TARGET_SCREEN_HEIGHT := 1920 +TARGET_SCREEN_WIDTH := 1080 + +# Inherit some common Lineage stuff. +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/google/marlin/aosp_sailfish.mk) + +-include device/google/marlin/sailfish/device-lineage.mk + +## Device identifier. This must come after all inclusions +PRODUCT_NAME := lineage_sailfish +PRODUCT_BRAND := google +PRODUCT_MODEL := Pixel +TARGET_MANUFACTURER := HTC +PRODUCT_RESTRICT_VENDOR_FILES := false + +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=sailfish \ + PRIVATE_BUILD_DESC="sailfish-user 10 QP1A.190711.020 5800535 release-keys" + +BUILD_FINGERPRINT := google/sailfish/sailfish:10/QP1A.190711.020/5800535:user/release-keys + +$(call inherit-product-if-exists, vendor/google/marlin/marlin-vendor.mk) diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk index eb1e364ff..e629c86b2 100644 --- a/marlin/BoardConfig.mk +++ b/marlin/BoardConfig.mk @@ -3,6 +3,9 @@ # Product-specific compile-time definitions # +# Allow Lineage config to override others +-include device/google/marlin/marlin/BoardConfigLineage.mk + TARGET_BOARD_PLATFORM := msm8996 TARGET_BOOTLOADER_BOARD_NAME := marlin TARGET_BOARD_INFO_FILE := device/google/marlin/marlin/board-info.txt diff --git a/marlin/BoardConfigLineage.mk b/marlin/BoardConfigLineage.mk new file mode 100644 index 000000000..af21e4af9 --- /dev/null +++ b/marlin/BoardConfigLineage.mk @@ -0,0 +1,2 @@ +# BoardConfig for lineage_marlin +include device/google/marlin/BoardConfigLineage.mk diff --git a/marlin/device-lineage.mk b/marlin/device-lineage.mk new file mode 100644 index 000000000..137942dce --- /dev/null +++ b/marlin/device-lineage.mk @@ -0,0 +1 @@ +$(call inherit-product, device/google/marlin/device-lineage.mk) diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk index ed8ea87d2..0e3e3dbed 100644 --- a/sailfish/BoardConfig.mk +++ b/sailfish/BoardConfig.mk @@ -3,6 +3,9 @@ # Product-specific compile-time definitions # +# Allow Lineage config to override others +-include device/google/marlin/sailfish/BoardConfigLineage.mk + TARGET_BOARD_PLATFORM := msm8996 TARGET_BOOTLOADER_BOARD_NAME := sailfish TARGET_BOARD_INFO_FILE := device/google/marlin/sailfish/board-info.txt diff --git a/sailfish/BoardConfigLineage.mk b/sailfish/BoardConfigLineage.mk new file mode 100644 index 000000000..5543f1ac8 --- /dev/null +++ b/sailfish/BoardConfigLineage.mk @@ -0,0 +1,2 @@ +# BoardConfig for lineage_sailfish +include device/google/marlin/BoardConfigLineage.mk diff --git a/sailfish/device-lineage.mk b/sailfish/device-lineage.mk new file mode 100644 index 000000000..137942dce --- /dev/null +++ b/sailfish/device-lineage.mk @@ -0,0 +1 @@ +$(call inherit-product, device/google/marlin/device-lineage.mk)