From b88982a77c560f658c8e97d079a886d655ab961c Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sat, 16 Jul 2022 00:38:37 +0200
Subject: [PATCH] overlay: Convert NetworkStack overlay to an RRO package

We can't use autogenerated RRO because android:targetName has to be set
to "NetworkStackConfig".

Change-Id: I6ff8a9c0dbd9607e71de5a65393328fe249a99e8
---
 config/common.mk                              |  1 +
 .../NetworkStack/res/values/config.xml        |  5 -----
 .../NetworkStackOverlay/Android.bp            |  9 ++++++++
 .../NetworkStackOverlay/AndroidManifest.xml   | 14 ++++++++++++
 .../NetworkStackOverlay/res/values/config.xml | 22 +++++++++++++++++++
 5 files changed, 46 insertions(+), 5 deletions(-)
 delete mode 100644 overlay/common/packages/modules/NetworkStack/res/values/config.xml
 create mode 100644 overlay/rro_packages/NetworkStackOverlay/Android.bp
 create mode 100644 overlay/rro_packages/NetworkStackOverlay/AndroidManifest.xml
 create mode 100644 overlay/rro_packages/NetworkStackOverlay/res/values/config.xml

diff --git a/config/common.mk b/config/common.mk
index 436fb2f1..d689a7ed 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -196,6 +196,7 @@ PRODUCT_PACKAGE_OVERLAYS += \
     vendor/lineage/overlay/no-rro
 
 PRODUCT_PACKAGES += \
+    NetworkStackOverlay \
     TrebuchetOverlay
 
 # Translations
diff --git a/overlay/common/packages/modules/NetworkStack/res/values/config.xml b/overlay/common/packages/modules/NetworkStack/res/values/config.xml
deleted file mode 100644
index fbcc5020..00000000
--- a/overlay/common/packages/modules/NetworkStack/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Configuration for including DHCP client hostname option -->
-    <bool name="config_dhcp_client_hostname">true</bool>
-</resources>
diff --git a/overlay/rro_packages/NetworkStackOverlay/Android.bp b/overlay/rro_packages/NetworkStackOverlay/Android.bp
new file mode 100644
index 00000000..03d90b9f
--- /dev/null
+++ b/overlay/rro_packages/NetworkStackOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "NetworkStackOverlay",
+    product_specific: true,
+}
diff --git a/overlay/rro_packages/NetworkStackOverlay/AndroidManifest.xml b/overlay/rro_packages/NetworkStackOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..0928397b
--- /dev/null
+++ b/overlay/rro_packages/NetworkStackOverlay/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.networkstack.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="100"
+        android:targetPackage="com.android.networkstack"
+        android:targetName="NetworkStackConfig" />
+</manifest>
diff --git a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
new file mode 100644
index 00000000..aef5c9ca
--- /dev/null
+++ b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 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.
+-->
+<resources>
+
+    <!-- Configuration for including DHCP client hostname option -->
+    <bool name="config_dhcp_client_hostname">true</bool>
+
+</resources>