From a905cd695def9167878fc0c23f417e34c61cd092 Mon Sep 17 00:00:00 2001
From: pix106 <sbordenave@gmail.com>
Date: Sat, 3 Oct 2020 12:16:51 +0200
Subject: [PATCH] clover: Lineage-ify

---
 AndroidProducts.mk                    |  8 ++++----
 carbon.dependencies                   | 18 ------------------
 carbon_clover.mk => lineage_clover.mk | 21 +++++++++------------
 3 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 carbon.dependencies
 rename carbon_clover.mk => lineage_clover.mk (80%)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3b911cc..0080afe 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -23,9 +23,9 @@
 
 # inherit MI PAD 4 lineage-OS device config
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/carbon_clover.mk
+    $(LOCAL_DIR)/lineage_clover.mk
 
 COMMON_LUNCH_CHOICES := \
-		carbon_clover-eng \
-		carbon_clover-userdebug \
-		carbon_clover-user
+		lineage_clover-eng \
+		lineage_clover-userdebug \
+		lineage_clover-user
diff --git a/carbon.dependencies b/carbon.dependencies
deleted file mode 100644
index 2157031..0000000
--- a/carbon.dependencies
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "repository":  "CarbonROM/android_device_xiaomi_sdm660-common",
-    "target_path": "device/xiaomi/sdm660-common",
-    "revision":    "cr-8.0"
-  },
-  {
-    "repository":  "CarbonROM/android_kernel_xiaomi_sdm660",
-    "target_path": "kernel/xiaomi/sdm660",
-    "revision":    "cr-8.0"
-  },
-  {
-    "remote":      "gh",
-    "repository":  "xiaomi-sdm660/android_vendor_xiaomi_Miuicamera",
-    "target_path": "vendor/xiaomi/MiuiCamera",
-    "revision":    "master"
-  }
-]
diff --git a/carbon_clover.mk b/lineage_clover.mk
similarity index 80%
rename from carbon_clover.mk
rename to lineage_clover.mk
index 00c6f83..bb6dbc8 100644
--- a/carbon_clover.mk
+++ b/lineage_clover.mk
@@ -21,26 +21,23 @@
 # definition file).
 #
 
-# Inherit device configuration
-$(call inherit-product, device/xiaomi/clover/device.mk)
-
-# Inherit Carbon GSM telephony parts
-$(call inherit-product, vendor/carbon/config/gsm.mk)
-
-# Inherit Carbon product configuration
-$(call inherit-product, vendor/carbon/config/common.mk)
+# 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)
 
 # Define first api level
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk)
 
-# CarbonRom Maintainer
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.carbon.maintainer="Rcstar6696"
+# Inherit some common Lineage stuff
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/xiaomi/clover/device.mk)
 
 # Device identifier
 PRODUCT_BRAND := Xiaomi
 PRODUCT_MANUFACTURER := Xiaomi
-PRODUCT_NAME := carbon_clover
+PRODUCT_NAME := lineage_clover
 PRODUCT_CHARACTERISTICS := tablet
 PRODUCT_DEVICE := clover
 PRODUCT_MODEL := MI PAD 4