Create a common overlay for all goldfish devices

phone and tablet things should not leak into
TVs, cars and wear.

Bug: 314839713
Test: atest GtsIrqDeviceMapTestCases
Change-Id: Ibc9969a5f15510bd688575521360b4a2627e92c0
Signed-off-by: Roman Kiryanov <rkir@google.com>

5 files changed, 40 insertions, 23 deletions

diff --git a/product/generic.mk b/product/generic.mk
index 2558349e..fa1c6896 100644
--- a/product/generic.mk
+++ b/product/generic.mk
@@ -91,6 +91,7 @@ PRODUCT_PACKAGES += \
     local_time.default \
     SdkSetup \
     goldfish_overlay_connectivity_gsi \
+    RanchuCommonOverlay \
     libGoldfishProfiler \
     dlkm_loader
 
diff --git a/rro_overlays/RanchuCommonOverlay/Android.bp b/rro_overlays/RanchuCommonOverlay/Android.bp
new file mode 100644
index 00000000..45764865
--- /dev/null
+++ b/rro_overlays/RanchuCommonOverlay/Android.bp
@@ -0,0 +1,28 @@
+//
+//  Copyright 2024, 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.
+//
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "RanchuCommonOverlay",
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/rro_overlays/RanchuCommonOverlay/AndroidManifest.xml b/rro_overlays/RanchuCommonOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..82c810e2
--- /dev/null
+++ b/rro_overlays/RanchuCommonOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.internal.ranchu.commonoverlay">
+
+    <application android:hasCode="false" />
+
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="3"
+      />
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/rro_overlays/RanchuCommonOverlay/res/xml/irq_device_map.xml
index 09d7a88b..09d7a88b 100644
--- a/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/rro_overlays/RanchuCommonOverlay/res/xml/irq_device_map.xml
diff --git a/tablet/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/tablet/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
deleted file mode 100644
index 09d7a88b..00000000
--- a/tablet/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2023, 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.
-*/
--->
-<irq-device-map>
-    <device name="rtc0">
-        <subsystem>Alarm</subsystem>
-    </device>
-</irq-device-map>