diff options
| author | Jooyung Han <jooyung@google.com> | 2023-08-25 01:29:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-25 01:29:59 +0000 |
| commit | b945ace31f7dea06a679afa7bc8cca45e9918f8b (patch) | |
| tree | 1bae0dce758552ef9fc18c9820eaa35b13befea7 /data | |
| parent | 55fca129651c75f8ec84c53a01a231a71e2bcace (diff) | |
| parent | f2584bdc9edd0d25d9a6d05375134899119ed883 (diff) | |
| download | native-b945ace31f7dea06a679afa7bc8cca45e9918f8b.tar.gz | |
Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e035e am: 0c0aba31f3 am: 2e77cd527c am: 5ce3bb9560 am: f2584bdc9e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2723775
Change-Id: I09bdf6cbb93db86f17c490a81a5174934a36df14
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 c962c15a24..de8e1cf923 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -107,6 +107,12 @@ prebuilt_etc { } prebuilt_etc { + name: "android.hardware.nfc.prebuilt.xml", + src: "android.hardware.nfc.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"], |