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

Commit 44fb69b1 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Use new soong support to install privapp xml"

parents 331417bf 29f5b765

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ android_app { 
    certificate: ":com.android.bluetooth.certificate",



    jarjar_rules: ":bluetooth-jarjar-rules",

    privapp_allowlist: ":privapp_allowlist_com.android.bluetooth.xml",



    jni_uses_platform_apis: true,

    libs: [

apex/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ apex { 
        "bt_stack.conf",

        "btservices-linker-config",

        "interop_database.conf",

        "privapp_allowlist_com.android.bluetooth.xml",

    ],

    key: "com.android.btservices.key",

    certificate: ":com.android.btservices.certificate",

apex/permissions/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



prebuilt_etc {

filegroup {

    name: "privapp_allowlist_com.android.bluetooth.xml",

    src: "com.android.bluetooth.xml",

    sub_dir: "permissions",

    installable: false,

    srcs: ["com.android.bluetooth.xml"],

}