commit 073b9b2ade9f298600a3661d825112850eea0355
author Jaewan Kim <jaewan@google.com> Tue Sep 05 18:58:14 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 05 18:58:14 2023 +0000
tree 2b447f1aba8a1169864952e94a9f8122ab7d6dbb
parent 4c8f03b27010c9b599e5e9e8fcd1cd71a82afa19
parent 3a309765b05bda74e30628835933ef9dc2ea4150

Merge "Enable NFC HCE" into main am: ec30622b36 am: e49176619d am: 083c611a49 am: 3a309765b0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2737213

Change-Id: I635e82bb2f7229749761bfc0b2f82c86298d335f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

data/etc/Android.bp

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 5f0bc75..4a54de1 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -113,6 +113,12 @@
 }
 
 prebuilt_etc {
+    name: "android.hardware.nfc.hce.prebuilt.xml",
+    src: "android.hardware.nfc.hce.xml",
+    defaults: ["frameworks_native_data_etc_defaults"],
+}
+
+prebuilt_etc {
     name: "android.hardware.reboot_escrow.prebuilt.xml",
     src: "android.hardware.reboot_escrow.xml",
     defaults: ["frameworks_native_data_etc_defaults"],