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

Commit 21764f13 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics "apex_default_removal",... 

Merge changes from topics "apex_default_removal", "include_bt_config_files_in_apex" into tm-dev am: 805393fe

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



Change-Id: Icd0f9efd579e14d9bd96d62659cd0c02fb4586bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3db07f5f 805393fe

apex/Android.bp

+19 −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"],
@@ -23,31 +32,24 @@ apex_defaults { 
    },



    prebuilts: [

        "audio_set_configurations_bfbs",

        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "bluetooth-linker-config",

        "bt_did.conf",

        "bt_stack.conf",

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