summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2023-08-24 23:26:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-24 23:26:57 +0000
commit0c0aba31f35cf0c248f7249ad863d45b711e3c25 (patch)
tree31233ce763c686547919b44839fa65b0fc5ab75b
parent7a75c8dc31bd08fe0479cbea6761f47aef0fd031 (diff)
parenteb0d1e035e82df9e401f482b93a8848137be08bc (diff)
Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e035e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2723775 Change-Id: I3e09bda0b444d91030b8807bfd884d23dcf09ac0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--data/etc/Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 60fb134c3c..ba6f671aeb 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -101,6 +101,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"],