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

Commit a463316e authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge bluetooth apex default in it's only usage am: bb37c5a4 am: 66338ed1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18080471



Change-Id: I45220cedaacf047b391953832547a2ebcad86a35
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79b8f068 66338ed1

apex/Android.bp

+13 −17
Original line number Diff line number Diff line
@@ -7,8 +7,17 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



apex_defaults {

    name: "com.android.bluetooth-defaults",

linker_config {

    name: "bluetooth-linker-config",

    src: "linker.config.json",

    installable: false,

}



//Mainline bluetooth apex module.

apex {

    name: "com.android.bluetooth",

    defaults: ["t-launched-apex-module"],

    manifest: "apex_manifest.json",

    bootclasspath_fragments: ["com.android.bluetooth-bootclasspath-fragment"],

    systemserverclasspath_fragments: ["com.android.bluetooth-systemserverclasspath-fragment"],

    apps: ["Bluetooth"],
@@ -24,30 +33,17 @@ apex_defaults { 


    prebuilts: [

        "bluetooth-linker-config",

        "privapp_allowlist_com.android.bluetooth.services.xml",

    ],



    key: "com.android.bluetooth.key",

    certificate: ":com.android.bluetooth.certificate",

    defaults: ["t-launched-apex-module"],

    updatable: true,

    // Indicates that pre-installed version of this apex can be compressed.

    // Whether it actually will be compressed is controlled on per-device basis.

    compressible: true,

}



linker_config {

    name: "bluetooth-linker-config",

    src: "linker.config.json",

    installable: false,

}



//Mainline bluetooth apex module.

apex {

    name: "com.android.bluetooth",

    defaults: ["com.android.bluetooth-defaults"],

    manifest: "apex_manifest.json",

    prebuilts: ["privapp_allowlist_com.android.bluetooth.services.xml"],

}



apex_key {

    name: "com.android.bluetooth.key",

    public_key: "com.android.bluetooth.avbpubkey",