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

Commit bb37c5a4 authored by William Escande's avatar William Escande
Browse files

Merge bluetooth apex default in it's only usage 

This is to avoid confusion on witch value is apply, the one from default
or the one from the apex or the one from the vendor override if any.

Rules are:
* module `apex` and module `apex_default` are merged (like in this CL)
* module `override_apex` keep all existing values as long as the key is
  not repeated inside the `override_apex`. If it is, discard all change
  in the base apex (or its default)

Bug: 230359868
Test: adb install <apex>; and check the files on phone
Tag: #refactor
Ignore-AOSP-First: No apex on aosp
Change-Id: Ie9adfc04dbe0920db8ce8d6aa756ca91a3101865
parent 89f4da04

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