From 13671d04c507df6fca029995f3ae041ace61c3d2 Mon Sep 17 00:00:00 2001
From: Nick Reuter <nreuter85@gmail.com>
Date: Thu, 10 Nov 2016 15:56:09 -0600
Subject: [PATCH] dre: initial setup to support aosp

Change-Id: I17da1754471e38c8bd8e2c278ba595d5acaa8f4d
---
 AndroidProducts.mk |  6 ++++++
 aosp_dre.mk        | 34 ++++++++++++++++++++++++++++++++++
 device.mk          | 10 ----------
 lineage_dre.mk     | 30 ++++++++++--------------------
 4 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 aosp_dre.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a8984f8..d353f4b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,10 @@
 #
 
 PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/aosp_dre.mk \
     $(LOCAL_DIR)/lineage_dre.mk
+
+COMMON_LUNCH_CHOICES := \
+    aosp_dre-trunk_staging-user \
+    aosp_dre-trunk_staging-userdebug \
+    aosp_dre-trunk_staging-eng
diff --git a/aosp_dre.mk b/aosp_dre.mk
new file mode 100644
index 0000000..939a85d
--- /dev/null
+++ b/aosp_dre.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+# 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 the common Open Source product configuration
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+TARGET_SUPPORTS_OMX_SERVICE := false
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+
+PRODUCT_NAME := aosp_dre
+PRODUCT_DEVICE := dre
+PRODUCT_BRAND := OnePlus
+PRODUCT_MODEL := AOSP on dre
+PRODUCT_MANUFACTURER := OnePlus
+PRODUCT_RESTRICT_VENDOR_FILES := false
+
+$(call inherit-product, device/oneplus/dre/device.mk)
+$(call inherit-product, vendor/oneplus/dre/dre-vendor.mk)
+
+PRODUCT_PACKAGES += \
+    Launcher3QuickStep
+
diff --git a/device.mk b/device.mk
index c540c71..553f51e 100644
--- a/device.mk
+++ b/device.mk
@@ -96,10 +96,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
 
-# Boot animation
-TARGET_SCREEN_HEIGHT := 2400
-TARGET_SCREEN_WIDTH := 1080
-
 # Boot control
 PRODUCT_PACKAGES += \
     android.hardware.boot-service.qti \
@@ -243,9 +239,6 @@ PRODUCT_COPY_FILES += \
 $(call inherit-product, hardware/oplus/overlay/generic/generic.mk)
 $(call inherit-product, hardware/oplus/overlay/qssi/qssi.mk)
 
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay-lineage
-
 PRODUCT_ENFORCE_RRO_TARGETS := *
 PRODUCT_PACKAGES += \
     CarrierConfigResCommon \
@@ -406,6 +399,3 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     firmware_wlan_mac.bin_symlink \
     firmware_WCNSS_qcom_cfg.ini_symlink
-
-# Get non-open-source specific aspects
-$(call inherit-product, vendor/oneplus/dre/dre-vendor.mk)
diff --git a/lineage_dre.mk b/lineage_dre.mk
index 1dcc7e2..03e9362 100644
--- a/lineage_dre.mk
+++ b/lineage_dre.mk
@@ -1,34 +1,24 @@
 #
 # Copyright (C) 2021-2023 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-TARGET_SUPPORTS_OMX_SERVICE := false
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+# Inherit from aosp_dre.
+$(call inherit-product, device/oneplus/dre/aosp_dre.mk)
 
-# Inherit from dre device
-$(call inherit-product, device/oneplus/dre/device.mk)
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2400
+TARGET_SCREEN_WIDTH := 1080
+
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += \
+    $(LOCAL_PATH)/overlay-lineage
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 PRODUCT_NAME := lineage_dre
-PRODUCT_DEVICE := dre
-PRODUCT_MANUFACTURER := OnePlus
-PRODUCT_BRAND := OnePlus
 PRODUCT_MODEL := DE2117
 
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus