From ab02aa029ed52acb1c13f856a2560a664d97fdad Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 10 Aug 2018 13:47:04 +0200
Subject: [PATCH] s5neolte: Consider lineage_s5neolte product via the AOSP  way

Change-Id: Ibdeb62f0aa30933a09ac12ca825025e5f18574ab
---
 AndroidProducts.mk                |  2 +-
 full_s5neolte.mk                  | 28 ----------------------------
 lineage.mk => lineage_s5neolte.mk | 11 +++++------
 3 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 full_s5neolte.mk
 rename lineage.mk => lineage_s5neolte.mk (80%)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ab1e233..fa33712 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,4 +17,4 @@
 LOCAL_PATH := device/samsung/s5neolte
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_s5neolte.mk
+    $(LOCAL_DIR)/lineage_s5neolte.mk
diff --git a/full_s5neolte.mk b/full_s5neolte.mk
deleted file mode 100644
index 69635a9..0000000
--- a/full_s5neolte.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2018 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.
-# 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.
-#
-
-LOCAL_PATH := device/samsung/s5neolte
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(LOCAL_PATH)/device.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_s5neolte
-PRODUCT_DEVICE := s5neolte
-PRODUCT_MODEL := SM-G903F
-PRODUCT_BRAND := Samsung
-PRODUCT_MANUFACTURER := samsung
diff --git a/lineage.mk b/lineage_s5neolte.mk
similarity index 80%
rename from lineage.mk
rename to lineage_s5neolte.mk
index dc8aa87..46248cc 100644
--- a/lineage.mk
+++ b/lineage_s5neolte.mk
@@ -16,19 +16,18 @@
 
 LOCAL_PATH := device/samsung/s5neolte
 
-$(call inherit-product, $(LOCAL_PATH)/full_s5neolte.mk)
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(LOCAL_PATH)/device.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l_mr1.mk)
 
-# Inherit some common Lineage stuff.
+# Inherit common Lineage phone.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Set those variables here to overwrite the inherited values.
 PRODUCT_NAME := lineage_s5neolte
 PRODUCT_DEVICE := s5neolte
 PRODUCT_MODEL := SM-G903F
-PRODUCT_BRAND := Samsung
+PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_GMS_CLIENTID_BASE := android-samsung
-- 
2.20.1