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

Commit fc02e4ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I88c41d6c,I4d8fd7e8 into main 

* changes:
  Remove libbt_shim_ffi from fluoride_defaults
  Remove apex_available:platform from libg722codec
parents ce8bb1b8 847f5c05

system/bta/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libchrome",

        "libcom.android.sysprop.bluetooth",
@@ -298,6 +299,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libchrome",

        "libosi",
@@ -416,6 +418,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libbtdevice",

        "libchrome",
@@ -479,6 +482,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

        "libosi",
@@ -525,6 +529,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

        "libosi",
@@ -583,6 +588,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

        "libosi",
@@ -728,6 +734,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -824,6 +831,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -901,6 +909,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -965,6 +974,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

        "libosi",
@@ -1021,6 +1031,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

    ],
@@ -1086,6 +1097,7 @@ cc_test { 
        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libevent",

        "libgmock",
@@ -1148,6 +1160,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libgmock",

    ],
@@ -1213,6 +1226,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

system/btif/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libosi",

    ],
@@ -387,6 +388,7 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libosi",

    ],
@@ -427,6 +429,7 @@ cc_test { 
        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libevent",

    ],
@@ -616,6 +619,7 @@ cc_test { 
        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtdevice",

        "libbtif",

        "libbtif-core",
@@ -750,6 +754,7 @@ cc_test { 
        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtdevice",

        "libbtif",

        "libbtif-core",

system/build/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -32,7 +32,4 @@ cc_defaults { 
        },

    },

    defaults: ["fluoride_types_defaults_fuzzable"],

    static_libs: [

        "libbt_shim_ffi",

    ],

}

system/device/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libbtdevice",

        "libchrome",
@@ -93,6 +94,7 @@ cc_test { 
        "libbluetooth-types",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libbtdevice",

        "libchrome",

system/device/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ cc_fuzz { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libbtdevice",

        "libchrome",