diff options
author | Roshan Pius <rpius@google.com> | 2023-11-08 21:45:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-08 21:45:37 +0000 |
commit | 175bbbee043631cb6476cab101a58415edb9a1ba (patch) | |
tree | 0e32de839540ba347b6abb8e3d1f372a02b72ea2 | |
parent | 7b01a97aa271d579e41bad748c4beb89de0713f1 (diff) | |
parent | 6ed619fb2c1395a66f70098f4d28d520cd7d5451 (diff) | |
download | coral-175bbbee043631cb6476cab101a58415edb9a1ba.tar.gz |
Merge "Revert "coral(nfc): Modify NFC overlays for NFC apex"" into main am: 6ed619fb2c
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123
Change-Id: I9014bc7af0a28f8057bd958e9d368203343cfed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | device.mk | 3 | ||||
-rw-r--r-- | 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
@@ -450,8 +450,7 @@ PRODUCT_PACKAGES += \ Tag \ SecureElement \ android.hardware.nfc-service.st \ - android.hardware.secure_element@1.0-service.st \ - NfcOverlayCoral + android.hardware.secure_element@1.0-service.st PRODUCT_COPY_FILES += \ device/google/coral/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020N/com.google.hardware.pixel.japan.xml \ diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/overlay/packages/apps/Nfc/res/values/config.xml index 959bbed0..959bbed0 100644 --- a/rro_overlays/NfcOverlay/res/values/config.xml +++ b/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 7e56cd7b..00000000 --- a/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_coral_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayCoral", - 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 5241aa4a..00000000 --- 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 35e9713f..00000000 --- a/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS |