Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: Iba357b308a79d0c8b560acd4f72b5423c9c83294
Change-Id: Icdf552029fb97a34e83c6dd7799433fc473a2506

1 files changed, 19 insertions, 7 deletions

diff --git a/pw_log_string/BUILD.bazel b/pw_log_string/BUILD.bazel
index e837734e7..6ba51d52e 100644
--- a/pw_log_string/BUILD.bazel
+++ b/pw_log_string/BUILD.bazel
@@ -25,39 +25,51 @@ licenses(["notice"])
 pw_cc_library(
     name = "pw_log_string",
     hdrs = [
-        "public/pw_log_string/log_string.h",
         "public_overrides/pw_log_backend/log_backend.h",
     ],
     includes = [
-        "public",
         "public_overrides",
     ],
     deps = [
-        ":handler",
+        ":handler_facade",
         "//pw_preprocessor",
     ],
 )
 
 pw_cc_facade(
     name = "handler_facade",
-    hdrs = ["public/pw_log_string/handler.h"],
+    hdrs = [
+        "public/pw_log_string/config.h",
+        "public/pw_log_string/handler.h",
+    ],
     includes = ["public"],
     deps = ["//pw_preprocessor"],
 )
 
+alias(
+    name = "impl",
+    actual = ":handler",
+)
+
 pw_cc_library(
     name = "handler",
     srcs = ["handler.cc"],
+    hdrs = [
+        "public/pw_log_string/config.h",
+        "public/pw_log_string/handler.h",
+    ],
+    includes = ["public"],
     deps = [
         ":handler_facade",
-        "@pigweed_config//:pw_log_string_handler_backend",
+        "//pw_preprocessor",
+        "@pigweed//targets:pw_log_string_handler_backend",
     ],
 )
 
 pw_cc_library(
     name = "handler_backend_multiplexer",
-    visibility = ["@pigweed_config//:__pkg__"],
-    # TODO(b/257539200): This probably should default to
+    visibility = ["@pigweed//targets:__pkg__"],
+    # TODO: b/257539200 - This probably should default to
     # //pw_system:log_backend, but that target does not yet build in Bazel.
     # deps = ["//pw_system:log_backend"],
 )