Improve Bazel btstack build correctness

Author: armandomontanez

bazel/config/BUILD.bazel

@@ -151,6 +151,17 @@ string_flag(
     ],
 )
 
+# PICO_BAZEL_CONFIG: PICO_ASYNC_CONTEXT_IMPL, The default implementation for pico_async_context to link, type=string, default=threadsafe_background, group=build
+string_flag(
+    name = "PICO_ASYNC_CONTEXT_IMPL",
+    build_setting_default = "threadsafe_background",
+    values = [
+        "poll",
+        "threadsafe_background",
+        "freertos",
+    ],
+)
+
 # PICO_BAZEL_CONFIG: PICO_BINARY_INFO_ENABLED, Whether to include binary info in final firmware, type=bool, default=1, group=pico_stdlib
 bool_flag(
     name = "PICO_BINARY_INFO_ENABLED",

bazel/constraint/BUILD.bazel

@@ -180,6 +180,21 @@ config_setting(
     flag_values = {"//bazel/config:PICO_DEFAULT_PRINTF_IMPL": "compiler"},
 )
 
+config_setting(
+    name = "pico_async_context_poll_enabled",
+    flag_values = {"//bazel/config:PICO_ASYNC_CONTEXT_IMPL": "poll"},
+)
+
+config_setting(
+    name = "pico_async_context_threadsafe_background_enabled",
+    flag_values = {"//bazel/config:PICO_ASYNC_CONTEXT_IMPL": "threadsafe_background"},
+)
+
+config_setting(
+    name = "pico_async_context_freertos_enabled",
+    flag_values = {"//bazel/config:PICO_ASYNC_CONTEXT_IMPL": "freertos"},
+)
+
 config_setting(
     name = "pico_use_default_max_page_size_enabled",
     flag_values = {"//bazel/config:PICO_USE_DEFAULT_MAX_PAGE_SIZE": "True"},

src/rp2_common/pico_async_context/BUILD.bazel

@@ -2,8 +2,18 @@ load("//bazel:defs.bzl", "compatible_with_rp2", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
+alias(
     name = "pico_async_context",
+    actual = select({
+        "//bazel/constraint:pico_async_context_poll_enabled": ":pico_async_context_poll",
+        "//bazel/constraint:pico_async_context_threadsafe_background_enabled": ":pico_async_context_threadsafe_background",
+        "//bazel/constraint:pico_async_context_freertos_enabled": ":pico_async_context_freertos",
+        "//conditions:default": "//bazel:incompatible_cc_lib",
+    }),
+)
+
+cc_library(
+    name = "pico_async_context_base",
     srcs = ["async_context_base.c"],
     hdrs = [
         "include/pico/async_context.h",
@@ -26,7 +36,7 @@ cc_library(
         "//bazel/constraint:pico_freertos_unset",
     ),
     deps = [
-        ":pico_async_context",
+        ":pico_async_context_base",
         "//bazel/config:PICO_FREERTOS_LIB",
         "//src/common/pico_sync",
         "//src/common/pico_time",
@@ -42,7 +52,7 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
-        ":pico_async_context",
+        ":pico_async_context_base",
         "//src/common/pico_sync",
         "//src/common/pico_time",
         "//src/rp2_common:pico_platform",
@@ -56,7 +66,7 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
-        ":pico_async_context",
+        ":pico_async_context_base",
         "//src/common/pico_sync",
         "//src/common/pico_time",
         "//src/rp2_common:pico_platform",

src/rp2_common/pico_btstack/BUILD.bazel

@@ -43,12 +43,17 @@ alias(
 
 alias(
     name = "pico_btstack_mesh",
-    actual = "@btstack//:pico_btstack_classic",
+    actual = "@btstack//:pico_btstack_mesh",
 )
 
 alias(
     name = "pico_btstack_sbc_encoder",
-    actual = "@btstack//:pico_btstack_classic",
+    actual = "@btstack//:pico_btstack_sbc_encoder",
+)
+
+alias(
+    name = "pico_btstack_sbc_decoder",
+    actual = "@btstack//:pico_btstack_sbc_decoder",
 )
 
 alias(
@@ -92,8 +97,10 @@ cc_library(
     srcs = ["btstack_stdin_pico.c"],
     target_compatible_with = compatible_with_pico_w() + incompatible_with_config("//bazel/constraint:pico_btstack_config_unset"),
     deps = [
+        ":pico_btstack_base",
         "//bazel/config:PICO_BTSTACK_CONFIG",
         "//src/rp2_common:pico_platform",
         "//src/rp2_common/pico_stdio",
     ],
+    alwayslink = True,
 )

src/rp2_common/pico_btstack/btstack.BUILD

@@ -37,6 +37,8 @@ cc_library(
     }),
     includes = [
         ".",
+        "3rd-party/bluedroid/decoder/include",
+        "3rd-party/bluedroid/encoder/include",
         "3rd-party/md5",
         "3rd-party/micro-ecc",
         "3rd-party/rijndael",
@@ -89,6 +91,7 @@ cc_library(
     copts = _DISABLE_WARNINGS,
     target_compatible_with = incompatible_with_config("@pico-sdk//bazel/constraint:pico_btstack_config_unset"),
     deps = [":pico_btstack_base_headers"],
+    alwayslink = True,
 )
 
 cc_library(
@@ -118,6 +121,7 @@ cc_library(
     copts = _DISABLE_WARNINGS,
     target_compatible_with = compatible_with_config("@pico-sdk//bazel/constraint:pico_bt_enable_ble_enabled"),
     deps = [":pico_btstack_base_headers"],
+    alwayslink = True,
 )
 
 cc_library(
@@ -174,6 +178,7 @@ cc_library(
         ":pico_btstack_base",
         ":pico_btstack_base_headers",
     ],
+    alwayslink = True,
 )
 
 cc_library(
@@ -218,6 +223,14 @@ cc_library(
         ":pico_btstack_base_headers",
         ":pico_btstack_ble",
     ],
+    alwayslink = True,
+)
+
+cc_library(
+    name = "pico_btstack_sbc_common",
+    srcs = ["src/classic/btstack_sbc_bluedroid.c"],
+    deps = [":pico_btstack_base_headers"],
+    target_compatible_with = incompatible_with_config("@pico-sdk//bazel/constraint:pico_btstack_config_unset"),
 )
 
 cc_library(
@@ -235,13 +248,18 @@ cc_library(
     ],
     copts = _DISABLE_WARNINGS,
     includes = ["3rd-party/bluedroid/decoder/include"],
-    deps = [":pico_btstack_base_headers"],
+    deps = [
+        ":pico_btstack_base_headers",
+        ":pico_btstack_sbc_common",
+    ],
+    alwayslink = True,
 )
 
 cc_library(
     name = "pico_btstack_sbc_decoder",
     srcs = [
         "src/classic/btstack_sbc_decoder_bluedroid.c",
+        "3rd-party/bluedroid/decoder/srce/readsamplesjoint.inc",
         "3rd-party/bluedroid/decoder/srce/alloc.c",
         "3rd-party/bluedroid/decoder/srce/bitalloc.c",
         "3rd-party/bluedroid/decoder/srce/bitalloc-sbc.c",
@@ -259,7 +277,11 @@ cc_library(
     ],
     copts = _DISABLE_WARNINGS,
     includes = ["3rd-party/bluedroid/decoder/include"],
-    deps = [":pico_btstack_base_headers"],
+    deps = [
+        ":pico_btstack_base_headers",
+        ":pico_btstack_sbc_common",
+    ],
+    alwayslink = True,
 )
 
 cc_library(

src/rp2_common/pico_cyw43_arch/BUILD.bazel

@@ -2,6 +2,36 @@ load("//bazel:defs.bzl", "compatible_with_pico_w", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
 
+alias(
+    name = "pico_cyw43_arch",
+    actual = select({
+        "//bazel/constraint:pico_lwip_config_unset": ":select_no_lwip",
+        "//conditions:default": ":select_lwip",
+    })
+)
+
+alias(
+    name = "select_lwip",
+    actual = select({
+        "//bazel/constraint:pico_async_context_poll_enabled": ":pico_cyw43_arch_lwip_poll",
+        "//bazel/constraint:pico_async_context_threadsafe_background_enabled": ":pico_cyw43_arch_lwip_threadsafe_background",
+        "//bazel/constraint:pico_async_context_freertos_enabled": ":pico_cyw43_arch_lwip_freertos",
+        "//conditions:default": "//bazel:incompatible_cc_lib",
+    }),
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "select_no_lwip",
+    actual = select({
+        "//bazel/constraint:pico_async_context_poll_enabled": ":pico_cyw43_arch_poll",
+        "//bazel/constraint:pico_async_context_threadsafe_background_enabled": ":pico_cyw43_arch_threadsafe_background",
+        "//bazel/constraint:pico_async_context_freertos_enabled": ":pico_cyw43_arch_freertos",
+        "//conditions:default": "//bazel:incompatible_cc_lib",
+    }),
+    visibility = ["//visibility:private"],
+)
+
 # Tuple is async_context type and whether or not lwip is enabled.
 _CONFIGURATIONS = [
     ("freertos", False),

tools/compare_build_systems.py

@@ -147,6 +147,7 @@
     "PICO_DEFAULT_PRINTF_IMPL",
     "PICO_DEFAULT_RAND_IMPL",
     "PICO_BINARY_INFO_ENABLED",
+    "PICO_ASYNC_CONTEXT_IMPL",
     # Allows selection of clang/gcc when using the dynamically fetched
     # toolchains.
     "PICO_TOOLCHAIN",