commit b41e320f18e5ed28c9aaafe3caab701c5a7d5249
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jun 29 08:37:14 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 29 08:37:14 2024 +0000
tree c7a1cf395851abcfaeb7684c97f13d66f6782803
parent 4c2a8153c60cb395701a14c1931fbdc8097d2556
parent c9e99f797b682a7df108262330ac3f960c8c3c43

Merge "Define android.software.credentials.xml as prebuilt_etc" into main am: c9e99f797b

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

Change-Id: I789312d71bdc7e3c0b8024054590c26c453181e2
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 766c768..64ef827 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -376,6 +376,14 @@
     defaults: ["frameworks_native_data_etc_defaults"],
 }
 
+// installed in system for GSI
+prebuilt_etc {
+    name: "android.software.credentials.prebuilt.xml",
+    relative_install_path: "permissions",
+    src: "android.software.credentials.xml",
+    filename_from_src: true,
+}
+
 prebuilt_etc {
     name: "android.software.device_id_attestation.prebuilt.xml",
     src: "android.software.device_id_attestation.xml",