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

Commit 0bab9286 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I5ab921bd4233acf2176960f48376283ab6ebd618
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee5894f8 b41e320f

data/etc/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ prebuilt_etc { 
    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",