diff options
author | Roshan Pius <rpius@google.com> | 2023-11-08 22:46:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-08 22:46:05 +0000 |
commit | 7c287ce810db9adb1ff801b09861eb42e0d55a78 (patch) | |
tree | 73d98d98a64abd0a6e555bef1540b1b62b756632 | |
parent | 5b54fcc3bf8e7d839ac3e0cb26f848bda4edd4fd (diff) | |
parent | 033e515e0adbfcd64333d0b5ee80254b68e98e7a (diff) | |
download | bluejay-7c287ce810db9adb1ff801b09861eb42e0d55a78.tar.gz |
Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e am: 033e515e0a
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: I644d4b2f369e336ab0c1929ddaaef8f327361504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | bluejay/overlay/packages/apps/Nfc/res/values/config.xml (renamed from bluejay/rro_overlays/NfcOverlay/res/values/config.xml) | 0 | ||||
-rw-r--r-- | bluejay/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | bluejay/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | device-bluejay.mk | 3 |
5 files changed, 1 insertions, 40 deletions
diff --git a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml index 5610991..5610991 100644 --- a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml +++ b/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 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 += \ |