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

Commit 04b2527f authored by Jack He's avatar Jack He
Browse files

BUILD: Disable build for mac-host target 

* Move disable darwin (mac) options to "fluoride_defaults".
* mac-host target is disabled across fluoride, but developer can still
  build for non-mac targets on a mac host.
* Remove vendor_libs/Android.mk that is no longer used.

Bug: 72618679
Test: make
Change-Id: Ibad9fad3df169e9c4e418a4511c42066fcb10fdc
parent 4e27c0bc

system/btcore/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ cc_library_static { 
    header_libs: ["libbluetooth_headers"],

    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

        linux_glibc: {

            cflags: ["-D_GNU_SOURCE"],

        },
@@ -50,9 +47,4 @@ cc_test { 
        "libosi",

    ],

    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        }

    }

}

system/btif/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -175,10 +175,5 @@ cc_test { 
        "libbluetooth-types",

        "libosi",

    ],

    target: {

        darwin: {

            enabled: false,

        },

    },

    cflags: ["-DBUILDCFG"],

}

system/build/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -39,8 +39,12 @@ fluoride_defaults { 
            ],

        },

    },

    shared_libs: [ "libchrome" ]

    // Setup Bluetooth local make variables for handling configuration

    shared_libs: [ "libchrome" ],

    target: {

        darwin: {

            enabled: false,

        },

    },

}



fluoride_defaults {

system/osi/Android.bp

+0 −21
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ cc_test_library { 
    shared: {

        enabled: false

    },

    target: {

        darwin: {

            enabled: false

        }

    }

}



cc_test_library {
@@ -39,11 +34,6 @@ cc_test_library { 
    shared: {

        enabled: false

    },

    target: {

        darwin: {

            enabled: false

        }

    }

}



// Bluetooth Protobuf static library for target and host
@@ -56,11 +46,6 @@ cc_library_static { 
        export_proto_headers: true,

    },

    host_supported: true,

    target: {

        darwin: {

            enabled: false

        }

    }

}
@@ -106,9 +91,6 @@ cc_library_static { 
    // should be compatible for a Linux host OS. We should figure out what to do for

    // a non-Linux host OS.

    target: {

        darwin: {

            enabled: false,

        },

        linux_glibc: {

            cflags: [

                "-D_GNU_SOURCE",
@@ -162,9 +144,6 @@ cc_test { 
        linux_glibc: {

            cflags: ["-DOS_GENERIC"],

        },

        darwin: {

            enabled: false,

        }

    },

    sanitize: {

        cfi: false,

system/packet/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -34,9 +34,4 @@ cc_test { 
        "lib-bt-packets",

    ],

    cflags: ["-DBUILDCFG","-g"],

    target: {

        darwin: {

            enabled: false

        }

    }

}