Skip to content

Commit

Permalink
bazel: Partial revert of http://pwrev.dev/226007
Browse files Browse the repository at this point in the history
Revert the changes to the keys in the dicts in
targets/rp2040/transition.bzl. Changing what strings appear as keys
leads to issues in downstream projects that rely on overriding them.

We still need to remove these "@Pigweed" string instances, but need to
tread more carefully. Will update the bug with ideas.

NO_IFTTT=The values of the flags are not changed.

Bug: 352389854
Change-Id: I22f81c37fa62e5db95cc744d48da1a55149e5f28
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/226271
Commit-Queue: Ted Pudlik <[email protected]>
Lint: Lint 🤖 <[email protected]>
Reviewed-by: Taylor Cramer <[email protected]>
  • Loading branch information
tpudlik authored and CQ Bot Account committed Jul 26, 2024
1 parent c605a3b commit 542cb92
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions targets/rp2040/transition.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ RP2040_SYSTEM_FLAGS = FREERTOS_FLAGS | {
"@freertos//:freertos_config": str(Label("//targets/rp2040:freertos_config")),
"@pico-sdk//bazel/config:PICO_STDIO_UART": True,
"@pico-sdk//bazel/config:PICO_STDIO_USB": True,
str(Label("//pw_assert:assert_backend")): str(Label("//pw_assert_trap")),
str(Label("//pw_assert:assert_backend_impl")): str(Label("//pw_assert_trap:impl")),
str(Label("//pw_assert:check_backend")): str(Label("//pw_assert_trap")),
str(Label("//pw_assert:check_backend_impl")): str(Label("//pw_assert_trap:impl")),
str(Label("//pw_build:default_module_config")): str(Label("//targets/rp2040:pigweed_module_config")),
str(Label("//pw_cpu_exception:entry_backend")): str(Label("//pw_cpu_exception_cortex_m:cpu_exception")),
str(Label("//pw_cpu_exception:entry_backend_impl")): str(Label("//pw_cpu_exception_cortex_m:cpu_exception_impl")),
str(Label("//pw_cpu_exception:handler_backend")): str(Label("//pw_cpu_exception:basic_handler")),
str(Label("//pw_cpu_exception:support_backend")): str(Label("//pw_cpu_exception_cortex_m:support")),
str(Label("//pw_interrupt:backend")): str(Label("//pw_interrupt_cortex_m:context")),
str(Label("//pw_log:backend")): str(Label("//pw_log_tokenized")),
str(Label("//pw_log:backend_impl")): str(Label("//pw_log_tokenized:impl")),
str(Label("//pw_log_tokenized:handler_backend")): str(Label("//pw_system:log_backend")),
str(Label("//pw_sys_io:backend")): str(Label("//pw_sys_io_rp2040")),
str(Label("//pw_system:device_handler_backend")): str(Label("//targets/rp2040:device_handler")),
str(Label("//pw_system:extra_platform_libs")): str(Label("//targets/rp2040:extra_platform_libs")),
str(Label("//pw_trace:backend")): str(Label("//pw_trace_tokenized:pw_trace_tokenized")),
str(Label("//pw_unit_test:backend")): str(Label("//pw_unit_test:light")),
str(Label("//pw_unit_test:main")): str(Label("//targets/rp2040:unit_test_app")),
"@pigweed//pw_assert:assert_backend": str(Label("//pw_assert_trap")),
"@pigweed//pw_assert:assert_backend_impl": str(Label("//pw_assert_trap:impl")),
"@pigweed//pw_assert:check_backend": str(Label("//pw_assert_trap")),
"@pigweed//pw_assert:check_backend_impl": str(Label("//pw_assert_trap:impl")),
"@pigweed//pw_build:default_module_config": str(Label("//targets/rp2040:pigweed_module_config")),
"@pigweed//pw_cpu_exception:entry_backend": str(Label("//pw_cpu_exception_cortex_m:cpu_exception")),
"@pigweed//pw_cpu_exception:entry_backend_impl": str(Label("//pw_cpu_exception_cortex_m:cpu_exception_impl")),
"@pigweed//pw_cpu_exception:handler_backend": str(Label("//pw_cpu_exception:basic_handler")),
"@pigweed//pw_cpu_exception:support_backend": str(Label("//pw_cpu_exception_cortex_m:support")),
"@pigweed//pw_interrupt:backend": str(Label("//pw_interrupt_cortex_m:context")),
"@pigweed//pw_log:backend": str(Label("//pw_log_tokenized")),
"@pigweed//pw_log:backend_impl": str(Label("//pw_log_tokenized:impl")),
"@pigweed//pw_log_tokenized:handler_backend": str(Label("//pw_system:log_backend")),
"@pigweed//pw_sys_io:backend": str(Label("//pw_sys_io_rp2040")),
"@pigweed//pw_system:device_handler_backend": str(Label("//targets/rp2040:device_handler")),
"@pigweed//pw_system:extra_platform_libs": str(Label("//targets/rp2040:extra_platform_libs")),
"@pigweed//pw_trace:backend": str(Label("//pw_trace_tokenized:pw_trace_tokenized")),
"@pigweed//pw_unit_test:backend": str(Label("//pw_unit_test:light")),
"@pigweed//pw_unit_test:main": str(Label("//targets/rp2040:unit_test_app")),
}

# Additional flags specific to the upstream Pigweed RP2040 platform.
Expand Down

0 comments on commit 542cb92

Please sign in to comment.