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

Commit 9776c0d8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove divergences in soong files from AOSP main" into main am: e02532f0 

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



Change-Id: I5b0925cb742546bdf25b2575c328c87b46ac9ede
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ec53ec2 e02532f0

system/btif/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ cc_library_static { 
    ],

    target: {

        android: {

            whole_static_libs: [

                "libPlatformProperties",

            ],

            srcs: ["src/btif_avrcp_audio_track.cc"],

            shared_libs: ["libaaudio"],

        },
@@ -211,9 +214,6 @@ cc_library_static { 
    ],

    target: {

        android: {

            whole_static_libs: [

                "libPlatformProperties",

            ],

            srcs: ["src/btif_avrcp_audio_track.cc"],

            shared_libs: ["libaaudio"],

        },

system/test/headless/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ cc_binary { 
        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

        "libPlatformProperties",

        "libaaudio",

        "libbase",

        "libbinder_ndk",
@@ -127,7 +128,6 @@ cc_binary { 
        "liblog", // __android_log_print

        "libstatssocket",

        "libutils",

        "libPlatformProperties",

    ],

    header_libs: ["libbluetooth_headers"],

}

system/test/suite/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ cc_defaults { 
        "android.hardware.bluetooth.audio@2.0",

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

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

        "libPlatformProperties",

        "libbinder",

        "libbinder_ndk",

        "libcrypto",
@@ -58,7 +59,6 @@ cc_defaults { 
        "liblog",

        "libstatssocket",

        "libutils",

        "libPlatformProperties",

    ],

    static_libs: [

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