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

Change-Id: Ibdeb62f0aa30933a09ac12ca825025e5f18574ab

# Conflicts:
#	AndroidProducts.mk
#	full_a7xelte.mk
#	lineage_a5xelte.mk
---
 AndroidProducts.mk                    |  2 +-
 lineage.mk                            | 34 ---------------------------
 full_a7xelte.mk => lineage_a7xelte.mk |  9 +++++--
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 lineage.mk
 rename full_a7xelte.mk => lineage_a7xelte.mk (77%)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 29dadcc..f383f6a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,4 +17,4 @@
 LOCAL_PATH := device/samsung/a7xelte
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_PATH)/full_a7xelte.mk
+    $(LOCAL_PATH)/lineage_a7xelte.mk
diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644
index 5673c95..0000000
--- a/lineage.mk
+++ /dev/null
@@ -1,34 +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/a7xelte
-
-$(call inherit-product, $(LOCAL_PATH)/full_a7xelte.mk)
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l_mr1.mk)
-
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := lineage_a7xelte
-PRODUCT_DEVICE := a7xelte
-PRODUCT_MODEL := SM-a710F
-PRODUCT_BRAND := Samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/full_a7xelte.mk b/lineage_a7xelte.mk
similarity index 77%
rename from full_a7xelte.mk
rename to lineage_a7xelte.mk
index 9dd9036..6e330b4 100644
--- a/full_a7xelte.mk
+++ b/lineage_a7xelte.mk
@@ -19,10 +19,15 @@ LOCAL_PATH := device/samsung/a7xelte
 # 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 common Lineage phone.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_a7xelte
+PRODUCT_NAME := lineage_a7xelte
 PRODUCT_DEVICE := a7xelte
 PRODUCT_MODEL := SM-A710F
-PRODUCT_BRAND := Samsung
+PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
+PRODUCT_GMS_CLIENTID_BASE := android-samsung
\ No newline at end of file
-- 
2.20.1