From 02b52edf46609e9342ec8d18e77ff4f03fb93e4e Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Sat, 1 Apr 2023 11:05:25 -0600
Subject: [PATCH] xpeng: Move overlay-lineage to resource-overlay

Change-Id: I785040aa17bb8471c8d4e2041e69f09e5cedb8d2
---
 device.mk                                           |  4 +---
 resource-overlay/xpeng/LineagePlatform/Android.bp   |  9 +++++++++
 .../xpeng/LineagePlatform/AndroidManifest.xml       | 13 +++++++++++++
 .../xpeng/LineagePlatform}/res/values/config.xml    |  0
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 resource-overlay/xpeng/LineagePlatform/Android.bp
 create mode 100644 resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml
 rename {overlay-lineage/lineage-sdk/lineage/res => resource-overlay/xpeng/LineagePlatform}/res/values/config.xml (100%)

diff --git a/device.mk b/device.mk
index e81a6af..c8d824b 100644
--- a/device.mk
+++ b/device.mk
@@ -27,11 +27,9 @@ PRODUCT_SHIPPING_API_LEVEL := 30
 $(call inherit-product, device/motorola/sm7325-common/sm7325.mk)
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay-lineage
-
 PRODUCT_PACKAGES += \
     FrameworksResXpeng \
+    LineagePlatformXpeng \
     LineageSystemUIXpeng \
     SettingsProviderResXpeng \
     SystemUIResXpeng
diff --git a/resource-overlay/xpeng/LineagePlatform/Android.bp b/resource-overlay/xpeng/LineagePlatform/Android.bp
new file mode 100644
index 0000000..e1cd2e2
--- /dev/null
+++ b/resource-overlay/xpeng/LineagePlatform/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022-2023 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "LineagePlatformXpeng",
+    vendor: true,
+}
diff --git a/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml b/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml
new file mode 100644
index 0000000..28438d2
--- /dev/null
+++ b/resource-overlay/xpeng/LineagePlatform/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022-2023 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.lineageos.platform.xpeng.lineage">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetPackage="com.lineageos.platform" />
+</manifest>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/resource-overlay/xpeng/LineagePlatform/res/values/config.xml
similarity index 100%
rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
rename to resource-overlay/xpeng/LineagePlatform/res/values/config.xml