diff options
author | Roshan Pius <rpius@google.com> | 2023-10-26 15:29:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-26 15:29:08 +0000 |
commit | 7ac75e4887a8e3b97d53dab62c83b690686a4bb9 (patch) | |
tree | 079deb185dc311d5c8871749491d7718bff47156 | |
parent | 376afa3cd8ee16dd15f597dbe4de6fea297ab6ad (diff) | |
parent | 4548a37dced1c04722aae8fb125ce338a42e8418 (diff) | |
download | bramble-7ac75e4887a8e3b97d53dab62c83b690686a4bb9.tar.gz |
bramble(nfc): Modify NFC overlays for NFC apex am: bcde01fd40 am: 26784740ea am: 4548a37dce
Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2802331
Change-Id: If788a9dfed9ed2ed3c97fbd2a2078695ebb16a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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-- | bramble/rro_overlays/NfcOverlay/res/values/config.xml (renamed from bramble/overlay/packages/apps/Nfc/res/values/config.xml) | 0 | ||||
-rw-r--r-- | device-bramble.mk | 3 |
5 files changed, 41 insertions, 0 deletions
diff --git a/bramble/rro_overlays/NfcOverlay/Android.bp b/bramble/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..24d1c23 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?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 new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/bramble/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/bramble/overlay/packages/apps/Nfc/res/values/config.xml b/bramble/rro_overlays/NfcOverlay/res/values/config.xml index fe16e58..fe16e58 100644 --- a/bramble/overlay/packages/apps/Nfc/res/values/config.xml +++ b/bramble/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-bramble.mk b/device-bramble.mk index bbf0368..a3bf089 100644 --- a/device-bramble.mk +++ b/device-bramble.mk @@ -208,3 +208,6 @@ PRODUCT_PACKAGES += \ # Workaround for Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat + +PRODUCT_PACKAGES += \ + NfcOverlayBramble |