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

Commit f91fc641 authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Automerger Merge Worker
Browse files

Merge "Add apex_available and min_sdk, sdk_version to deps of bt apex" am:... 

Merge "Add apex_available and min_sdk, sdk_version to deps of bt apex" am: 1146d842 am: 63a97507

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

Change-Id: I5a6ab0e5f9ee767d94913af8b39db63177b4209f
parents 50671b63 63a97507

system/audio_a2dp_hw/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ cc_library { 
        "src/audio_a2dp_hw.cc",

        "src/audio_a2dp_hw_utils.cc",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth",

    ],

    shared_libs: [

        "liblog",

        "libcutils",
@@ -42,6 +46,7 @@ cc_library_static { 
        "src/audio_a2dp_hw_utils.cc",

    ],

    host_supported: true,

    min_sdk_version: "29",

}



// Audio A2DP library unit tests for target and host

system/audio_hearing_aid_hw/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ cc_library { 
        "src/audio_hearing_aid_hw.cc",

        "src/audio_hearing_aid_hw_utils.cc",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth",

    ],

    shared_libs: [

        "liblog",

    ],

system/btcore/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ cc_defaults { 
    ],

    header_libs: ["libbluetooth_headers"],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth",

    ],

    target: {

        linux_glibc: {

            cflags: ["-D_GNU_SOURCE"],
@@ -52,6 +56,11 @@ cc_library_headers { 
    export_include_dirs: ["./"],

    vendor_available: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth",

    ],

    min_sdk_version: "30",

}



// Note: It's good to get the tests compiled both for the host and the target so

system/btif/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ cc_library { 
    shared_libs: [

        "libcutils",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth",

    ],

    min_sdk_version: "30",

    target: {

        android: {

            shared_libs: [

system/build/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -96,7 +96,11 @@ fluoride_defaults { 
        "liblog",

        "libcutils",

    ],

    shared_libs: [

        "liblog",

    ],

    cpp_std: "c++17",

    min_sdk_version: "current",

}



fluoride_defaults {