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

Commit e94b403a authored by David Duarte's avatar David Duarte Committed by Android Build Cherrypicker Worker
Browse files

Remove divergences in soong files from AOSP main 

Bug: 298680973
Test: mmm packages/modules/Bluetooth
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a94ef57ebc136a62cbf322a9f577fcb1caf93da7)
Merged-In: Iccb65bc4ede79b656b5b17d3596d99744c168861
Change-Id: Iccb65bc4ede79b656b5b17d3596d99744c168861
parent fca6e070

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