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

Commit 29f5b765 authored by Anton Hansson's avatar Anton Hansson Committed by Android Build Cherrypicker Worker
Browse files

Use new soong support to install privapp xml 

This allows better overriding of it in the variants of this apex
that have a different package name.

Bug: 242509786
Test: build google bt, diff before & after
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ebd1acbcf15286030d939908f6e4ebfaeb56b68c)
Merged-In: I54dd8373a74873276198c007a026ffb2ab8a8c12
Change-Id: I54dd8373a74873276198c007a026ffb2ab8a8c12
parent 349be0e7

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"],

}