From 43fe8ff795c211e58fd7a2d43dddb75e35c75433 Mon Sep 17 00:00:00 2001
From: steadfasterX <steadfasterX@gmail.com>
Date: Fri, 10 May 2019 17:34:31 +0200
Subject: [PATCH] h811: setup for lineage-16.0

Change-Id: I1343e895107265292546bdaf66b08c45fb2b6832
---
 full_h811.mk => AndroidProducts.mk | 17 +++---------
 lineage.mk                         | 20 --------------
 lineage_h811.mk                    | 42 ++++++++++++++++++++++++++++++
 vendorsetup.sh                     |  3 +++
 4 files changed, 48 insertions(+), 34 deletions(-)
 rename full_h811.mk => AndroidProducts.mk (52%)
 delete mode 100644 lineage.mk
 create mode 100644 lineage_h811.mk

diff --git a/full_h811.mk b/AndroidProducts.mk
similarity index 52%
rename from full_h811.mk
rename to AndroidProducts.mk
index 1ac9bdc..f3764c8 100644
--- a/full_h811.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2015 The CyanogenMod Project
+# Copyright 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,16 +14,5 @@
 # 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 h815 device
-$(call inherit-product, device/lge/h811/device.mk)
-
-# Set those variables here to overwrite the inherited values.
-PRODUCT_DEVICE := h811
-PRODUCT_NAME := full_h811
-PRODUCT_BRAND := lge
-PRODUCT_MODEL := LG-H811
-PRODUCT_MANUFACTURER := LGE
+PRODUCT_MAKEFILES += \
+    $(LOCAL_DIR)/lineage_h811.mk
diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644
index 8aa75a6..0000000
--- a/lineage.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-$(call inherit-product, device/lge/h811/full_h811.mk)
-
-# Inherit some common AOSCP stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-# Overlays (inherit after vendor/lineage to ensure we override it)
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-
-PRODUCT_NAME := lineage_h811
-PRODUCT_DEVICE := h811
-PRODUCT_BRAND := lge
-PRODUCT_MODEL := LG-H811
-PRODUCT_MANUFACTURER := LGE
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_DEVICE="g4" \
-    PRODUCT_NAME="g4__tmo_us" \
-    PRIVATE_BUILD_DESC="p1__tmo_us-user 8.0 NRD90U 1717709471d0f release-keys"
-
-BUILD_FINGERPRINT := "lge/p1__tmo_us/p1:8.1.0/OPM4.171019.016.A1/4720811:user/release-keys"
diff --git a/lineage_h811.mk b/lineage_h811.mk
new file mode 100644
index 0000000..8bdfcb8
--- /dev/null
+++ b/lineage_h811.mk
@@ -0,0 +1,42 @@
+#
+# Copyright 2015 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.
+#
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2560
+TARGET_SCREEN_WIDTH := 1440
+
+# Inherit some common LineageOS stuff.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit from the common Open Source product configuration
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, $(LOCAL_PATH)/device.mk)
+
+PRODUCT_NAME := lineage_h811
+PRODUCT_DEVICE := h811
+PRODUCT_BRAND := lge
+PRODUCT_MODEL := LG-H811
+PRODUCT_MANUFACTURER := LGE
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_DEVICE="g4" \
+    PRODUCT_NAME="g4__tmo_us" \
+    PRIVATE_BUILD_DESC="p1__tmo_us-user 8.0 NRD90U 1717709471d0f release-keys"
+
+BUILD_FINGERPRINT := "lge/p1__tmo_us/p1:8.1.0/OPM4.171019.016.A1/4720811:user/release-keys"
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 09552a2..f20a50a 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,6 @@
+export ALLOW_MISSING_DEPENDENCIES=true
+export USE_NINJA=true
+
 add_lunch_combo lineage_h811-userdebug
 add_lunch_combo lineage_h811-user
 add_lunch_combo lineage_h811-eng