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

Commit 522950ff authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added platform_compat_config to enable target sdk check" into tm-dev... 

Merge "Added platform_compat_config to enable target sdk check" into tm-dev am: 8b6a20dd am: ce5995a8

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



Change-Id: I20d4431c7f13f965bae4b82c0cb73e6602fff5d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f53d146 ce5995a8

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

}