diff options
| author | Jaewan Kim <jaewan@google.com> | 2023-09-05 16:56:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-05 16:56:44 +0000 |
| commit | e49176619dd5ec8636788896c4b3a0c0b737b8ae (patch) | |
| tree | d8580289a1e85a67e64f6149cd0326c6ca06cb25 /data | |
| parent | c5a3087b469ebf8ec05f22ac694c95b3149f78ed (diff) | |
| parent | ec30622b3608821156d164ff23fe6fb99080c8e4 (diff) | |
| download | native-e49176619dd5ec8636788896c4b3a0c0b737b8ae.tar.gz | |
Merge "Enable NFC HCE" into main am: ec30622b36
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2737213
Change-Id: Iabc7124d6da44aa3f75d9ac4a761618f51706508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/Android.bp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 5f0bc7541b..4a54de1635 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -113,6 +113,12 @@ prebuilt_etc { } 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"], |