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

Commit 95c39997 authored by Myles Watson's avatar Myles Watson
Browse files

Factor out libchrome_support_defaults 

Disable Mac support for host binaries in one place, since
the dependency is based on libchrome support.

Test: build
Change-Id: I6641e18deffdff5205da181ad97e8b2892073a8f
parent 5a09d480

system/build/Android.bp

+16 −9
Original line number Diff line number Diff line
@@ -15,13 +15,26 @@ bootstrap_go_package { 
}



fluoride_defaults {

    name: "fluoride_types_defaults",

    name: "libchrome_support_defaults",

    shared_libs: ["libchrome"],

    cflags: [

        "-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

        "-fvisibility=hidden",

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    target: {

        darwin: {

            enabled: false,

        },

    },

}



fluoride_defaults {

    name: "fluoride_types_defaults",

    defaults: ["libchrome_support_defaults"],

    cflags: [

        "-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

        "-fvisibility=hidden",

        // struct BT_HDR is defined as a variable-size header in a struct.

        "-Wno-gnu-variable-sized-type-not-at-end",

        // there are too many unused parameters in all the code.
@@ -38,12 +51,6 @@ fluoride_defaults { 
            ],

        },

    },

    shared_libs: [ "libchrome" ],

    target: {

        darwin: {

            enabled: false,

        },

    },

}



fluoride_defaults {

system/packet/Android.bp

+1 −5
Original line number Diff line number Diff line 
cc_library_static {

    name: "lib-bt-packets",

    defaults: ["libchrome_support_defaults"],

    host_supported: true,

    export_include_dirs: [

        "./include",
@@ -9,11 +10,6 @@ cc_library_static { 
        "lib-bt-packets-base",

        "lib-bt-packets-avrcp",

    ],

    target: {

        darwin: {

            enabled: false

        }

    }

}



cc_test {

system/packet/avrcp/Android.bp

+1 −13
Original line number Diff line number Diff line 
cc_library_static {

    name: "lib-bt-packets-avrcp",

    defaults: ["libchrome_support_defaults"],

    export_include_dirs: ["."],

    host_supported: true,

    srcs: [
@@ -12,20 +13,7 @@ cc_library_static { 
        "register_notification_packet.cc",

        "avrcp_reject_packet.cc",

    ],

    shared_libs: [

        "libchrome",

    ],

    static_libs: [

        "lib-bt-packets-base",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    target: {

        darwin: {

            enabled: false

        }

    }

}

system/packet/base/Android.bp

+2 −14
Original line number Diff line number Diff line 
cc_library_static {

    name: "lib-bt-packets-base",

    defaults: ["libchrome_support_defaults"],

    export_include_dirs: ["./"],

    host_supported: true,

    srcs: [
@@ -7,17 +8,4 @@ cc_library_static { 
        "iterator.cc",

        "packet_builder.cc",

    ],

    shared_libs: [

        "libchrome",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    target: {

        darwin: {

            enabled: false

        }

    }

}

system/vendor_libs/test_vendor_lib/Android.bp

+2 −13
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
// ========================================================

cc_library_static {

    name: "libbt-rootcanal",

    defaults: ["libchrome_support_defaults"],

    proprietary: true,

    srcs: [

        "src/acl_packet.cc",
@@ -29,9 +30,6 @@ cc_library_static { 
    ],

    cflags: [

        "-fvisibility=hidden",

        "-Wall",

        "-Wextra",

        "-Werror",

        "-DHAS_NO_BDROID_BUILDCFG",

    ],

    local_include_dirs: [
@@ -50,7 +48,6 @@ cc_library_static { 
    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "liblog",

    ],

    static_libs: [
@@ -62,6 +59,7 @@ cc_library_static { 
// ========================================================

cc_test_host {

    name: "test-vendor_test_host",

    defaults: ["libchrome_support_defaults"],

    srcs: [

        "src/async_manager.cc",

        "src/bt_address.cc",
@@ -90,21 +88,12 @@ cc_test_host { 
    ],

    shared_libs: [

        "liblog",

        "libchrome",

    ],

    static_libs: [

        "libbluetooth-types",

    ],

    cflags: [

        "-fvisibility=hidden",

        "-Wall",

        "-Wextra",

        "-Werror",

        "-DLOG_NDEBUG=1",

    ],

    target: {

        darwin: {

            enabled: false,

        }

    },

}