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

Commit b7650292 authored by David Duarte's avatar David Duarte
Browse files

Remove fluoride_basic_defaults 

Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: Iec785861eab6f2eed51833c9bfc4247cb7546663
parent c5d6a5e7

android/app/Android.bp

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




cc_library_shared {

cc_library_shared {

    name: "libbluetooth_jni",

    name: "libbluetooth_jni",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

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

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

    version_script: "libbluetooth_jni.map",

    version_script: "libbluetooth_jni.map",

    header_libs: [

    header_libs: [
@@ -150,7 +150,7 @@ cc_library_shared { 




cc_library {

cc_library {

    name: "libbluetooth-core",

    name: "libbluetooth-core",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    header_libs: [

    header_libs: [

        "jni_headers",

        "jni_headers",

        "libbluetooth_headers",

        "libbluetooth_headers",

system/bta/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ package { 




cc_defaults {

cc_defaults {

    name: "fluoride_bta_defaults",

    name: "fluoride_bta_defaults",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    local_include_dirs: [

    local_include_dirs: [

        "dm",

        "dm",

        "hd",

        "hd",

system/btcore/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ package { 




cc_defaults {

cc_defaults {

    name: "libbtcore_defaults",

    name: "libbtcore_defaults",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    local_include_dirs: ["include"],

    local_include_dirs: ["include"],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system",
@@ -36,7 +36,7 @@ cc_defaults { 




cc_library_static {

cc_library_static {

    name: "libbthalutils",

    name: "libbthalutils",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    srcs: [

    srcs: [

        "src/hal_util.cc",

        "src/hal_util.cc",

    ],

    ],

system/btif/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ genrule { 




cc_library_static {

cc_library_static {

    name: "libbtif",

    name: "libbtif",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    include_dirs: btifCommonIncludes,

    srcs: [

    srcs: [

        // AVRCP Target Service

        // AVRCP Target Service
@@ -171,7 +171,7 @@ cc_library_static { 




cc_library_static {

cc_library_static {

    name: "libbtif-core",

    name: "libbtif-core",

    defaults: ["fluoride_basic_defaults"],

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    include_dirs: btifCommonIncludes,

    srcs: [

    srcs: [

        // Callouts

        // Callouts

system/build/Android.bp

+0 −7
Original line number Original line Diff line number Diff line
@@ -82,13 +82,6 @@ cc_defaults { 
    },

    },

}

}





cc_defaults {

    name: "fluoride_basic_defaults",

    defaults: [

        "fluoride_defaults",

    ],

}



cc_defaults {

cc_defaults {

    name: "fluoride_defaults",

    name: "fluoride_defaults",

    defaults: [

    defaults: [