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: I5c116ec0359d3d2cc5b44fbf83951934b80c103f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from bramble/rro_overlays/NfcOverlay/res/values/config.xml
rename to 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 @@
# Workaround for Qualcomm neural network HAL
PRODUCT_PACKAGES += \
libprotobuf-cpp-full-3.9.1-vendorcompat
-
-PRODUCT_PACKAGES += \
- NfcOverlayBramble
