bazel: Minor cleanups
Incoporate feedback comments from
https://pigweed-review.googlesource.com/c/pigweed/showcase/rp2/+/211925
Change-Id: Ia63098f39f19123aff1f276de244448261483f98
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/kudzu/+/212418
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/.bazelrc b/.bazelrc
index d19db21..babc50d 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -23,9 +23,10 @@
common --per_file_copt=external/.*@-w
common --host_per_file_copt=external/.*@-w
-common --@freertos//:freertos_config=@kudzu//targets/rp2040:freertos_config
common --host_platform=//targets/host
+common --custom_malloc=//targets:malloc
+
# Required for new toolchain resolution API.
build --incompatible_enable_cc_toolchain_resolution
diff --git a/.bazelversion b/.bazelversion
index 66ce77b..a8a1887 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.0.0
+7.1.2
diff --git a/lib/rpc/BUILD.bazel b/lib/rpc/BUILD.bazel
index 6ab1860..fa4ac4a 100644
--- a/lib/rpc/BUILD.bazel
+++ b/lib/rpc/BUILD.bazel
@@ -15,7 +15,8 @@
load(
"@pigweed//pw_protobuf_compiler:pw_proto_library.bzl",
"pw_proto_filegroup",
- "pw_proto_library",
+ "pwpb_proto_library",
+ "pwpb_rpc_proto_library",
)
package(default_visibility = ["//visibility:public"])
@@ -36,8 +37,14 @@
],
)
-pw_proto_library(
- name = "kudzu_cc",
+pwpb_proto_library(
+ name = "kudzu_pwpb",
+ deps = [":kudzu_proto"],
+)
+
+pwpb_rpc_proto_library(
+ name = "kudzu_pwpb_rpc",
+ pwpb_proto_library_deps = [":kudzu_pwpb"],
deps = [":kudzu_proto"],
)
@@ -46,7 +53,7 @@
hdrs = ["public/kudzu/kudzu_service_pwpb.h"],
includes = ["public"],
deps = [
- ":kudzu_cc.pwpb_rpc",
+ ":kudzu_pwpb_rpc",
"@pico-sdk//src/rp2_common/hardware_adc",
"@pico-sdk//src/rp2_common/pico_bootrom",
],
diff --git a/targets/rp2040/BUILD.bazel b/targets/rp2040/BUILD.bazel
index 1123ad8..f3b4dc4 100644
--- a/targets/rp2040/BUILD.bazel
+++ b/targets/rp2040/BUILD.bazel
@@ -22,7 +22,6 @@
"@freertos//:disable_task_statics",
"@pico-sdk//bazel/constraint:rp2040",
"@pico-sdk//bazel/constraint:stdio_usb",
- "@pigweed//targets/rp2040:freertos_config_cv",
"@pigweed//pw_build/constraints/rtos:freertos",
"@pigweed//pw_build/constraints/chipset:rp2040",
@@ -39,6 +38,7 @@
"@pico-sdk//src/common/pico_stdlib:pico_stdlib",
"@pigweed//pw_tokenizer:linker_script",
],
+ alwayslink = 1,
)
cc_library(
@@ -47,7 +47,6 @@
"config/FreeRTOSConfig.h",
],
includes = ["config"],
- target_compatible_with = ["@pigweed//targets/rp2040:freertos_config_cv"],
deps = ["@pigweed//third_party/freertos:config_assert"],
)
@@ -56,14 +55,10 @@
srcs = [
"boot.cc",
],
- target_compatible_with = ["@pigweed//targets/rp2040:freertos_config_cv"],
deps = [
- ":freertos_config",
"//lib/rpc:kudzu_service",
"@freertos",
- "@pico-sdk//src/rp2_common/pico_stdlib:pico_stdlib",
"@pigweed//pw_assert",
- "@pigweed//pw_assert:backend_impl",
"@pigweed//pw_string",
"@pigweed//pw_system:init",
],
diff --git a/targets/transition.bzl b/targets/transition.bzl
index f00f9a6..5c86192 100644
--- a/targets/transition.bzl
+++ b/targets/transition.bzl
@@ -23,6 +23,7 @@
return {
"//command_line_option:platforms": "//targets/rp2040:platform",
+ "@freertos//:freertos_config": "//targets/rp2040:freertos_config",
"@pigweed//pw_interrupt:backend": "@pigweed//pw_interrupt_cortex_m:context",
"@pigweed//pw_log:backend": "@pigweed//pw_log_tokenized",
"@pigweed//pw_log:backend_impl": "@pigweed//pw_log_tokenized:impl",
@@ -36,6 +37,7 @@
inputs = [],
outputs = [
"//command_line_option:platforms",
+ "@freertos//:freertos_config",
"@pigweed//pw_log:backend_impl",
"@pigweed//pw_log:backend",
"@pigweed//pw_log_tokenized:handler_backend",
