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

Commit 6557491c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Define prebuilt xml files as prebuilt_etc modules" into main am: 3a47ac77 am: d2b130fb 

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



Change-Id: I8c88089225c8f40a22d2074b927301fdf0924079
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1009c36a d2b130fb

data/etc/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -418,6 +418,14 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



// installed in system

prebuilt_etc {

    name: "android.software.preview_sdk.prebuilt.xml",

    relative_install_path: "permissions",

    src: "android.software.preview_sdk.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "android.software.sip.voip.prebuilt.xml",

    src: "android.software.sip.voip.xml",
@@ -460,6 +468,22 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



// installed in system

prebuilt_etc {

    name: "android.software.webview.prebuilt.xml",

    relative_install_path: "permissions",

    src: "android.software.webview.xml",

    filename_from_src: true,

}



// installed in system

prebuilt_etc {

    name: "android.software.window_magnification.prebuilt.xml",

    relative_install_path: "permissions",

    src: "android.software.window_magnification.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "aosp_excluded_hardware.prebuilt.xml",

    src: "aosp_excluded_hardware.xml",