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

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

Merge changes Ie30ec056,Ife787088 

* changes:
  Remove unused android.hardware.bluetooth.a2dp@1.0 from fluoride_basic_defaults
  Remove libutils from fluoride_defaults
parents b449a623 3bc2834e

android/app/Android.bp

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

        "libfmq",

        "libnativehelper",

        "libutils",

    ],

    sanitize: {

        scs: true,

system/audio_hal_interface/Android.bp

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

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

        "libhidlbase",

        "libutils",

    ],

    static_libs: [

        "libbt-common",

system/btif/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ cc_test { 
        "libcrypto",

        "libfmq",

        "libhidlbase",

        "libutils",

    ],

    static_libs: [

        "android.hardware.audio.common-V1-ndk",
@@ -573,6 +574,7 @@ cc_test { 
        "libcutils",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",
@@ -705,6 +707,7 @@ cc_test { 
        "libcutils",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    static_libs: [

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

system/build/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ cc_defaults { 
        "com.android.btservices",

    ],

    static_libs: [

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

        "libbt-protos-lite",

        "libflatbuffers-cpp",

        "libprotobuf-cpp-lite",
@@ -133,7 +132,6 @@ cc_defaults { 
    shared_libs: [

        "libcutils",

        "libhidlbase",

        "libutils",

    ],

    target: {

        darwin: {