Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b945ace3 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e03 am:...

Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e03 am: 0c0aba31 am: 2e77cd52 am: 5ce3bb95 am: f2584bdc

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



Change-Id: I09bdf6cbb93db86f17c490a81a5174934a36df14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55fca129 f2584bdc
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ prebuilt_etc {
    defaults: ["frameworks_native_data_etc_defaults"],
}

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",