Revert "bluejay(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:40ba66aca3ed1c1e5d3a7dbbaffa0b73ec4d396c)
Merged-In: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
diff --git a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from bluejay/rro_overlays/NfcOverlay/res/values/config.xml
rename to bluejay/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/bluejay/rro_overlays/NfcOverlay/Android.bp b/bluejay/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index c38f6c9..0000000
--- a/bluejay/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
- default_applicable_licenses: ["device_google_bluejay_license"],
-}
-
-runtime_resource_overlay {
- name: "NfcOverlayBluejay",
- sdk_version: "current",
- product_specific: true
-}
diff --git a/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml b/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/bluejay/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/bluejay/rro_overlays/NfcOverlay/OWNERS b/bluejay/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/bluejay/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 7a26ef6..b470757 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -111,8 +111,7 @@
PRODUCT_PACKAGES += \
com.android.nfcservices \
Tag \
- android.hardware.nfc-service.st \
- NfcOverlayBluejay
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
