From cd9e31bbb0d27d0d7c9a93062ab2b8f1c9afa81a Mon Sep 17 00:00:00 2001
From: Joel16 <joel16@iastate.edu>
Date: Sun, 29 Dec 2019 21:28:44 -0500
Subject: [PATCH] Clean up lineage makefiles

---
 full_satsuki.mk | 29 -----------------------------
 lineage.mk      | 23 ++++++++++++++++++-----
 2 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 full_satsuki.mk

diff --git a/full_satsuki.mk b/full_satsuki.mk
deleted file mode 100644
index e6d8299..0000000
--- a/full_satsuki.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2016 The CyanogenMod Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# 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 satsuki device
-$(call inherit-product, device/sony/satsuki/device.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_BRAND := Sony
-PRODUCT_NAME := full_satsuki
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_DEVICE := satsuki
-PRODUCT_MODEL := Xperia Z5 Premium
diff --git a/lineage.mk b/lineage.mk
index 1e9c895..1dc58e3 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2015 The CyanogenMod Project
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,11 +12,24 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
-$(call inherit-product, device/sony/satsuki/full_satsuki.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)
 
-# Inherit some common CM stuff
+# Inherit from satsuki device
+$(call inherit-product, device/sony/satsuki/device.mk)
+
+# Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 PRODUCT_NAME := lineage_satsuki
+PRODUCT_DEVICE := satsuki
+PRODUCT_MANUFACTURER := Sony
+PRODUCT_BRAND := Sony
+PRODUCT_MODEL := Xperia Z5 Premium
+
+PRODUCT_GMS_CLIENTID_BASE := android-sony
+
+TARGET_VENDOR := Sony
+TARGET_VENDOR_PRODUCT_NAME := satsuki