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

Commit fa3cb46e authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge changes I3ea3fc11,Idbe70708,Ibb11f957 

* changes:
  Move android.hardware.bluetooth.audio-V3-ndk to static_libs in tests
  Remove unused android.hardware.bluetooth.audio-V3-ndk in tests
  Remove android.hardware.bluetooth.audio-V3-ndk from defaults
parents 0bcfa66e 65a2ed67

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ cc_library_shared { 
        "libmodpb64",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

    ],

system/bta/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -755,10 +755,6 @@ cc_test { 
    ],

    target: {

        android: {

            shared_libs: [

                "android.hardware.bluetooth.audio-V3-ndk",

                "libbinder_ndk",

            ],

            whole_static_libs: [

                "libPlatformProperties",

            ],
@@ -881,14 +877,6 @@ cc_test { 
        "liblc3",

        "libosi",

    ],

    target: {

        android: {

            shared_libs: [

                "android.hardware.bluetooth.audio-V3-ndk",

                "libbinder_ndk",

            ],

        },

    },

    sanitize: {

        cfi: true,

        scs: true,

system/btif/Android.bp

+19 −3
Original line number Diff line number Diff line
@@ -260,8 +260,13 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",

        "android.hardware.audio.common-V1-ndk",

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.media.audio.common.types-V2-ndk",

        "android.system.suspend.control-V1-ndk",

        "libFraunhoferAAC",

        "libbluetooth-types",
@@ -295,7 +300,6 @@ cc_test { 
    target: {

        android: {

            shared_libs: [

                "android.hardware.bluetooth.audio-V3-ndk",

                "libPlatformProperties",

                "libbinder_ndk",

            ],
@@ -590,8 +594,14 @@ cc_test { 
    cflags: ["-DBUILDCFG"],

    target: {

        android: {

            shared_libs: [

            static_libs: [

                "android.hardware.audio.common-V1-ndk",

                "android.hardware.bluetooth.audio-V3-ndk",

                "android.hardware.common-V2-ndk",

                "android.hardware.common.fmq-V1-ndk",

                "android.media.audio.common.types-V2-ndk",

            ],

            shared_libs: [

                "libbinder_ndk",

            ],

        },
@@ -715,8 +725,14 @@ cc_test { 
    cflags: ["-DBUILDCFG"],

    target: {

        android: {

            shared_libs: [

            static_libs: [

                "android.hardware.audio.common-V1-ndk",

                "android.hardware.bluetooth.audio-V3-ndk",

                "android.hardware.common-V2-ndk",

                "android.hardware.common.fmq-V1-ndk",

                "android.media.audio.common.types-V2-ndk",

            ],

            shared_libs: [

                "libbinder_ndk",

            ],

        },

system/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ cc_defaults { 
    target: {

        android: {

            shared_libs: [

                "android.hardware.bluetooth.audio-V3-ndk",

                "android.system.suspend-V1-ndk",

                "libPlatformProperties",

                "libaaudio",

system/stack/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ cc_test { 
        "test/stack_avrcp_test.cc",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "libPlatformProperties",
@@ -330,8 +329,13 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",

        "android.hardware.audio.common-V1-ndk",

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.media.audio.common.types-V2-ndk",

        "android.system.suspend.control-V1-ndk",

        "libFraunhoferAAC",

        "libbluetooth-dumpsys",