diff options
author | Roshan Pius <rpius@google.com> | 2023-11-08 21:48:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-08 21:48:53 +0000 |
commit | 3dde12e01e9f2efd44307b830874d6c4b8267ea7 (patch) | |
tree | de3421f1424cc62a68cf52b2e7d88dab3bd9daa1 | |
parent | 086c083dddd8b4bc01dac45407d6e496a57b43be (diff) | |
parent | 0dd46deb147e6aeac93ee0dc3475ff59e8e19445 (diff) | |
download | bramble-3dde12e01e9f2efd44307b830874d6c4b8267ea7.tar.gz |
Merge "Revert "bramble(nfc): Modify NFC overlays for NFC apex"" into main am: 0dd46deb14
Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2818126
Change-Id: I04741c6e735b272c9a90128528f24fae2bf35cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | bramble/overlay/packages/apps/Nfc/res/values/config.xml (renamed from bramble/rro_overlays/NfcOverlay/res/values/config.xml) | 0 | ||||
-rw-r--r-- | bramble/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | bramble/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | bramble/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | device-bramble.mk | 3 |
5 files changed, 0 insertions, 41 deletions
diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/overlay/packages/apps/Nfc/res/values/config.xml index fe16e58..fe16e58 100644 --- a/bramble/rro_overlays/NfcOverlay/res/values/config.xml +++ b/bramble/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/bramble/rro_overlays/NfcOverlay/Android.bp b/bramble/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 24d1c23..0000000 --- a/bramble/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_bramble_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayBramble", - sdk_version: "current", - product_specific: true -} diff --git a/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/bramble/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/bramble/rro_overlays/NfcOverlay/OWNERS b/bramble/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/bramble/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS diff --git a/device-bramble.mk b/device-bramble.mk index a3bf089..bbf0368 100644 --- a/device-bramble.mk +++ b/device-bramble.mk @@ -208,6 +208,3 @@ PRODUCT_PACKAGES += \ # Workaround for Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -PRODUCT_PACKAGES += \ - NfcOverlayBramble |