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

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

Merge "Remove libchrome_support_defaults from other defaults"

parents 6d48c78e 867151f7

android/app/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ cc_library_shared { 
        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libc++fs",

        "libchrome",

        "libevent",

        "libmodpb64",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

system/audio_hal_interface/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ cc_test { 
    static_libs: [

        "libbt-audio-hal-interface",

        "libbt-common",

        "libchrome",

    ],

    cflags: [

        "-DBUILDCFG",

system/bta/Android.bp

+18 −1
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ cc_test { 
        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libosi",

    ],
@@ -269,6 +270,7 @@ cc_test { 
        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libchrome",

        "libosi",

    ],

}
@@ -352,7 +354,9 @@ cc_test { 
        "libbt-protos-lite",

        "libbtcore",

        "libbtdevice",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],
@@ -403,6 +407,7 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",

    ],
@@ -446,6 +451,7 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",

    ],
@@ -500,6 +506,7 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "libosi",

    ],
@@ -666,6 +673,8 @@ cc_test { 
    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

        "libosi",
@@ -736,6 +745,8 @@ cc_test { 
        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

        "liblc3",
@@ -810,6 +821,7 @@ cc_test { 
    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

        "liblc3",

    ],
@@ -873,6 +885,8 @@ cc_test { 
        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libgmock",

        "liblc3",

        "libosi",
@@ -940,6 +954,7 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libgmock",

    ],

    sanitize: {
@@ -1005,9 +1020,11 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libgmock",

        "libosi", // ADDED

        "libosi",

    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

system/btcore/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ cc_test { 
    ],

    static_libs: [

        "libbtcore",

        "libchrome",

        "libosi",

        "libosi-AllocationTestHarness",

    ],

system/btif/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ cc_test { 
        "libbtdevice",

        "libbtif",

        "libbtif-core",

        "libchrome",

        "libg722codec",

        "liblc3",

        "libopus",
@@ -327,6 +328,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libchrome",

        "libflatbuffers-cpp",

        "libosi",

    ],
@@ -361,6 +363,8 @@ cc_test { 
        "libbluetooth-types",

        "libbt-common",

        "libbt-protos-lite",

        "libchrome",

        "libevent",

        "libosi",

        "libosi-AllocationTestHarness",

    ],
@@ -400,6 +404,7 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libc++fs",

        "libchrome",

        "libgmock",

        "libosi",

    ],
@@ -434,6 +439,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libosi",

    ],
@@ -543,7 +549,9 @@ cc_test { 
        "libbtif",

        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],
@@ -666,7 +674,9 @@ cc_test { 
        "libbtif",

        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

        "libflatbuffers-cpp",

        "libgmock",

    ],