diff options
author | Roshan Pius <rpius@google.com> | 2023-11-08 21:16:20 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-08 21:16:20 +0000 |
commit | fe8604e7e8896cc08fea748c556655ce580c5005 (patch) | |
tree | 4a508994e6c0cbf9d8f4114b5d82a9579754c760 | |
parent | 8562f5b7868bd22db8ce89fa8b6548ad39978aca (diff) | |
parent | 7cbe17540a2aa98e1069f547ff4fe35906ff7b28 (diff) | |
download | lynx-fe8604e7e8896cc08fea748c556655ce580c5005.tar.gz |
Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main
-rw-r--r-- | device-lynx.mk | 3 | ||||
-rw-r--r-- | lynx/overlay/packages/apps/Nfc/res/values/config.xml (renamed from rro_overlays/NfcOverlay/res/values/config.xml) | 0 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/OWNERS | 2 |
5 files changed, 1 insertions, 40 deletions
diff --git a/device-lynx.mk b/device-lynx.mk index 07f7f73..ac90b11 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -80,8 +80,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayLynx + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/lynx/overlay/packages/apps/Nfc/res/values/config.xml index 4a8efa9..4a8efa9 100644 --- a/rro_overlays/NfcOverlay/res/values/config.xml +++ b/lynx/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 0b3fcb6..0000000 --- a/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_lynx_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayLynx", - sdk_version: "current", - product_specific: true -} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/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/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS |