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 @@ - - - - - - - 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 c2b228a..a184f86 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -102,8 +102,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfcservices \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayBluejay + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \