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

Commit 49940898 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19203172] into tm-release. 

Change-Id: Iff4b0f9ffa58788f16fd1689ac68d25affa16b20
parents 5fc8a1da cea8f230

apex/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ apex { 
    manifest: "apex_manifest.json",

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

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

    compat_configs: ["bluetooth-compat-config"],

    apps: ["Bluetooth"],



    multilib: {
@@ -55,6 +56,7 @@ apex { 
    manifest: "apex_manifest.json",

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

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

    compat_configs: ["bluetooth-compat-config"],

    apps: ["Bluetooth"],



    multilib: {

service/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -134,3 +134,9 @@ gensrcs { 
    ],

    output_extension: "srcjar",

}



platform_compat_config

{

    name: "bluetooth-compat-config",

    src: ":service-bluetooth-pre-jarjar",

}