From 35ad1b0498c147fdb6d6003dca5c09b9dd58a73f Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Sat, 4 Nov 2023 19:05:03 +0000
Subject: [PATCH] Revert "raviole(nfc): Modify NFC overlays for NFC apex"

Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:ec76544b6397c1efdbcc28b6de021dd1f1d7ce78)
Merged-In: I2716c95474b35fff59726c1cb9a54e5ea42f941e
Change-Id: I2716c95474b35fff59726c1cb9a54e5ea42f941e
---
 device-oriole.mk                              |  3 +--
 device-raven.mk                               |  3 +--
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 oriole/rro_overlays/NfcOverlay/Android.bp     |  9 -------
 .../NfcOverlay/AndroidManifest.xml            | 27 -------------------
 oriole/rro_overlays/NfcOverlay/OWNERS         |  2 --
 .../packages/apps/Nfc}/res/values/config.xml  |  0
 raven/rro_overlays/NfcOverlay/Android.bp      |  9 -------
 .../NfcOverlay/AndroidManifest.xml            | 27 -------------------
 raven/rro_overlays/NfcOverlay/OWNERS          |  2 --
 10 files changed, 2 insertions(+), 80 deletions(-)
 rename oriole/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 oriole/rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 oriole/rro_overlays/NfcOverlay/OWNERS
 rename raven/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%)
 delete mode 100644 raven/rro_overlays/NfcOverlay/Android.bp
 delete mode 100644 raven/rro_overlays/NfcOverlay/AndroidManifest.xml
 delete mode 100644 raven/rro_overlays/NfcOverlay/OWNERS

diff --git a/device-oriole.mk b/device-oriole.mk
index ff4e468..58fcc15 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -148,8 +148,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayOriole
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index ae2f63e..32e8b81 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -154,8 +154,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayRaven
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from oriole/rro_overlays/NfcOverlay/res/values/config.xml
rename to oriole/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 80de891..0000000
--- a/oriole/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_raviole_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayOriole",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/oriole/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from raven/rro_overlays/NfcOverlay/res/values/config.xml
rename to raven/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 85b298c..0000000
--- a/raven/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_raviole_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayRaven",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/raven/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS