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

Commit 688c2d47 authored by David Duarte's avatar David Duarte
Browse files

Remove fluoride_full_defaults 

Test: mma
Bug: 279502784
Change-Id: I8676c1cb36d1f2e72dd127ed77306ba4a0104818
parent 5d2398cb

android/app/Android.bp

+18 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ java_library { 


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_full_defaults"],

    defaults: ["fluoride_basic_defaults"],

    srcs: ["jni/**/*.cpp"],

    header_libs: [

        "jni_headers",
@@ -67,14 +67,31 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/types",

    ],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-hci",

        "libbt-stack",

        "libbt-stack-core",

        "libbtcore",

        "libbtdevice",

        "libbte",

        "libbtif",

        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libevent",

        "libmodpb64",

        "libosi",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

system/build/Android.bp

+0 −24
Original line number Diff line number Diff line
@@ -196,30 +196,6 @@ cc_defaults { 
    },

}



cc_defaults {

    name: "fluoride_full_defaults",

    defaults: ["fluoride_basic_defaults"],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-hci",

        "libbt-stack",

        "libbt-stack-core",

        "libbtcore",

        "libbtdevice",

        "libbte",

        "libbtif",

        "libbtif-core",

        "libosi",

    ],

}



cc_defaults {

    name: "fluoride_defaults",

    defaults: [

system/main/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ cc_library { 
        "//packages/modules/Bluetooth:__subpackages__",

        "//vendor:__subpackages__",

    ],

    defaults: ["fluoride_full_defaults"],

    defaults: ["fluoride_basic_defaults"],

    header_libs: ["libbluetooth_headers"],

    export_header_lib_headers: ["libbluetooth_headers"],

    include_dirs: [