a7xelte: Consider lineage_a7xelte product via the AOSP way

Change-Id: Ibdeb62f0aa30933a09ac12ca825025e5f18574ab

# Conflicts:
#	AndroidProducts.mk
#	full_a7xelte.mk
#	lineage_a5xelte.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 29dadcc47fe82df8a11947a5720b98b4db070657..f383f6a447882d26479ce9fd3b0150bc68de69b5 100644 (file)
--- 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/full_a7xelte.mk b/full_a7xelte.mk
deleted file mode 100644 (file)
index 9dd9036..0000000
--- a/full_a7xelte.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/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)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_a7xelte
-PRODUCT_DEVICE := a7xelte
-PRODUCT_MODEL := SM-A710F
-PRODUCT_BRAND := Samsung
-PRODUCT_MANUFACTURER := samsung

diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644 (file)
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/lineage_a7xelte.mk b/lineage_a7xelte.mk
new file mode 100644 (file)
index 0000000..6e330b4
--- /dev/null
+++ b/lineage_a7xelte.mk
@@ -0,0 +1,33 @@
+#
+# 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
+
+# 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 := lineage_a7xelte
+PRODUCT_DEVICE := a7xelte
+PRODUCT_MODEL := SM-A710F
+PRODUCT_BRAND := samsung
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_GMS_CLIENTID_BASE := android-samsung
\ No newline at end of file