diff options
| -rw-r--r-- | btcore/Android.bp | 8 | ||||
| -rw-r--r-- | btif/Android.bp | 5 | ||||
| -rw-r--r-- | build/Android.bp | 8 | ||||
| -rw-r--r-- | osi/Android.bp | 21 | ||||
| -rw-r--r-- | packet/Android.bp | 5 | ||||
| -rw-r--r-- | service/Android.bp | 3 | ||||
| -rw-r--r-- | service/common/Android.bp | 5 | ||||
| -rw-r--r-- | types/Android.bp | 10 | ||||
| -rw-r--r-- | vendor_libs/Android.mk | 28 | ||||
| -rw-r--r-- | vendor_libs/test_vendor_lib/Android.bp | 5 |
10 files changed, 6 insertions, 92 deletions
diff --git a/btcore/Android.bp b/btcore/Android.bp index 6c6d22ebd..6f5b0adae 100644 --- a/btcore/Android.bp +++ b/btcore/Android.bp @@ -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, - } - } } diff --git a/btif/Android.bp b/btif/Android.bp index e57c154b8..88b3cfa04 100644 --- a/btif/Android.bp +++ b/btif/Android.bp @@ -175,10 +175,5 @@ cc_test { "libbluetooth-types", "libosi", ], - target: { - darwin: { - enabled: false, - }, - }, cflags: ["-DBUILDCFG"], } diff --git a/build/Android.bp b/build/Android.bp index 53d461d9d..cf5768078 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -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 { diff --git a/osi/Android.bp b/osi/Android.bp index cdbd3756c..be8cdfd9f 100644 --- a/osi/Android.bp +++ b/osi/Android.bp @@ -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, diff --git a/packet/Android.bp b/packet/Android.bp index 53f4d43f3..302c49e47 100644 --- a/packet/Android.bp +++ b/packet/Android.bp @@ -34,9 +34,4 @@ cc_test { "lib-bt-packets", ], cflags: ["-DBUILDCFG","-g"], - target: { - darwin: { - enabled: false - } - } } diff --git a/service/Android.bp b/service/Android.bp index 6f6bf9c6b..89bd44795 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -132,9 +132,6 @@ cc_test { "test/stub_ipc_handler_binder.cc", ], }, - darwin: { - enabled: false, - }, linux_glibc: { srcs: btserviceLinuxSrc + [ // TODO(bcf): Fix this test. diff --git a/service/common/Android.bp b/service/common/Android.bp index f88359f15..b3fbfc458 100644 --- a/service/common/Android.bp +++ b/service/common/Android.bp @@ -25,11 +25,6 @@ cc_library_static { shared_libs: [ "libbase", ], - target: { - darwin: { - enabled: false - } - } } // Bluetooth Binder shared library diff --git a/types/Android.bp b/types/Android.bp index 81a914019..5867d63e3 100644 --- a/types/Android.bp +++ b/types/Android.bp @@ -21,11 +21,6 @@ cc_library_static { ], header_libs: ["libbluetooth-types-header"], export_header_lib_headers: ["libbluetooth-types-header"], - target: { - darwin: { - enabled: false - } - } } // ======================================================== @@ -38,9 +33,4 @@ cc_test { "test/raw_address_unittest.cc", "test/bluetooth/uuid_unittest.cc", ], - target: { - darwin: { - enabled: false - } - } } diff --git a/vendor_libs/Android.mk b/vendor_libs/Android.mk deleted file mode 100644 index 31d6e6bb4..000000000 --- a/vendor_libs/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Common C/C++ compiler flags for test-vendor lib -# -# -Wno-gnu-variable-sized-type-not-at-end is needed, because struct BT_HDR -# is defined as a variable-size header in a struct. -# -Wno-typedef-redefinition is needed because of the way the struct typedef -# is done in osi/include header files. This issue can be obsoleted by -# switching to C11 or C++. -# -Wno-unused-parameter is needed, because there are too many unused -# parameters in all the code. -# -test-vendor_CFLAGS += \ - -fvisibility=hidden \ - -Wall \ - -Wextra \ - -Werror \ - -Wno-gnu-variable-sized-type-not-at-end \ - -Wno-typedef-redefinition \ - -Wno-unused-parameter \ - -DLOG_NDEBUG=1 \ - -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))" - -test-vendor_CONLYFLAGS += -std=c99 - -include $(call all-subdir-makefiles) - -# Cleanup our locals -test-vendor_CFLAGS := -test-vendor_CONLYFLAGS := diff --git a/vendor_libs/test_vendor_lib/Android.bp b/vendor_libs/test_vendor_lib/Android.bp index bceeb96a7..1167b1a49 100644 --- a/vendor_libs/test_vendor_lib/Android.bp +++ b/vendor_libs/test_vendor_lib/Android.bp @@ -102,9 +102,4 @@ cc_test_host { "-Werror", "-DLOG_NDEBUG=1", ], - target: { - darwin: { - enabled: false, - } - }, } |