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
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index d2a5884..4983a91 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -18,9 +18,6 @@
header_libs: ["libbluetooth_headers"],
host_supported: true,
target: {
- darwin: {
- enabled: false,
- },
linux_glibc: {
cflags: ["-D_GNU_SOURCE"],
},
@@ -50,9 +47,4 @@
"libosi",
],
host_supported: true,
- target: {
- darwin: {
- enabled: false,
- }
- }
}
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index d5db0a9..b411289 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -175,10 +175,5 @@
"libbluetooth-types",
"libosi",
],
- target: {
- darwin: {
- enabled: false,
- },
- },
cflags: ["-DBUILDCFG"],
}
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 53d461d..cf57680 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -39,8 +39,12 @@
],
},
},
- shared_libs: [ "libchrome" ]
- // Setup Bluetooth local make variables for handling configuration
+ shared_libs: [ "libchrome" ],
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
}
fluoride_defaults {
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 769771a..4d89e90 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -22,11 +22,6 @@
shared: {
enabled: false
},
- target: {
- darwin: {
- enabled: false
- }
- }
}
cc_test_library {
@@ -39,11 +34,6 @@
shared: {
enabled: false
},
- target: {
- darwin: {
- enabled: false
- }
- }
}
// Bluetooth Protobuf static library for target and host
@@ -56,11 +46,6 @@
export_proto_headers: true,
},
host_supported: true,
- target: {
- darwin: {
- enabled: false
- }
- }
}
@@ -106,9 +91,6 @@
// 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 @@
linux_glibc: {
cflags: ["-DOS_GENERIC"],
},
- darwin: {
- enabled: false,
- }
},
sanitize: {
cfi: false,
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 53f4d43..302c49e 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -34,9 +34,4 @@
"lib-bt-packets",
],
cflags: ["-DBUILDCFG","-g"],
- target: {
- darwin: {
- enabled: false
- }
- }
}
diff --git a/system/service/Android.bp b/system/service/Android.bp
index 6a1e564..b50b782 100644
--- a/system/service/Android.bp
+++ b/system/service/Android.bp
@@ -132,9 +132,6 @@
"test/stub_ipc_handler_binder.cc",
],
},
- darwin: {
- enabled: false,
- },
linux_glibc: {
srcs: btserviceLinuxSrc + [
// TODO(bcf): Fix this test.
diff --git a/system/service/common/Android.bp b/system/service/common/Android.bp
index 3383faa..025f298 100644
--- a/system/service/common/Android.bp
+++ b/system/service/common/Android.bp
@@ -25,11 +25,6 @@
shared_libs: [
"libbase",
],
- target: {
- darwin: {
- enabled: false
- }
- }
}
// Bluetooth Binder shared library
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 81a9140..5867d63 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -21,11 +21,6 @@
],
header_libs: ["libbluetooth-types-header"],
export_header_lib_headers: ["libbluetooth-types-header"],
- target: {
- darwin: {
- enabled: false
- }
- }
}
// ========================================================
@@ -38,9 +33,4 @@
"test/raw_address_unittest.cc",
"test/bluetooth/uuid_unittest.cc",
],
- target: {
- darwin: {
- enabled: false
- }
- }
}
diff --git a/system/vendor_libs/Android.mk b/system/vendor_libs/Android.mk
deleted file mode 100644
index 31d6e6b..0000000
--- a/system/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/system/vendor_libs/test_vendor_lib/Android.bp b/system/vendor_libs/test_vendor_lib/Android.bp
index e6abfda..fe2a7696 100644
--- a/system/vendor_libs/test_vendor_lib/Android.bp
+++ b/system/vendor_libs/test_vendor_lib/Android.bp
@@ -102,9 +102,4 @@
"-Werror",
"-DLOG_NDEBUG=1",
],
- target: {
- darwin: {
- enabled: false,
- }
- },
}
