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

diff --git a/build/Android.bp b/build/Android.bp
index 0402a6d..b8abb0f 100644 (file)
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -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 {

diff --git a/packet/Android.bp b/packet/Android.bp
index f28d9a7..2bcd5e0 100644 (file)
--- a/packet/Android.bp
+++ b/packet/Android.bp
@@ -1,5 +1,6 @@
 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 {

diff --git a/packet/avrcp/Android.bp b/packet/avrcp/Android.bp
index ecf58e3..8fb788b 100644 (file)
--- a/packet/avrcp/Android.bp
+++ b/packet/avrcp/Android.bp
@@ -1,5 +1,6 @@
 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
-        }
-    }
 }

diff --git a/packet/base/Android.bp b/packet/base/Android.bp
index 3a98337..67f77d6 100644 (file)
--- a/packet/base/Android.bp
+++ b/packet/base/Android.bp
@@ -1,5 +1,6 @@
 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
-        }
-    }
-}
\ No newline at end of file
+}

diff --git a/vendor_libs/test_vendor_lib/Android.bp b/vendor_libs/test_vendor_lib/Android.bp
index bceeb96..7805f82 100644 (file)
--- a/vendor_libs/test_vendor_lib/Android.bp
+++ b/vendor_libs/test_vendor_lib/Android.bp
@@ -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,
-        }
-    },
 }