1 files changed, 66 insertions, 29 deletions

diff --git a/absl/debugging/BUILD.bazel b/absl/debugging/BUILD.bazel
index 6e867cef..52b407c0 100644
--- a/absl/debugging/BUILD.bazel
+++ b/absl/debugging/BUILD.bazel
@@ -219,19 +219,8 @@ cc_library(
 
 cc_library(
     name = "demangle_internal",
-    srcs = [
-        "internal/decode_rust_punycode.cc",
-        "internal/demangle.cc",
-        "internal/demangle_rust.cc",
-        "internal/utf8_for_code_point.cc",
-    ],
-    hdrs = [
-        "internal/bounded_utf8_length_sequence.h",
-        "internal/decode_rust_punycode.h",
-        "internal/demangle.h",
-        "internal/demangle_rust.h",
-        "internal/utf8_for_code_point.h",
-    ],
+    srcs = ["internal/demangle.cc"],
+    hdrs = ["internal/demangle.h"],
     copts = ABSL_DEFAULT_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     visibility = [
@@ -239,6 +228,7 @@ cc_library(
         "//absl/debugging:__pkg__",
     ],
     deps = [
+        ":demangle_rust",
         "//absl/base",
         "//absl/base:config",
         "//absl/base:core_headers",
@@ -248,69 +238,116 @@ cc_library(
 )
 
 cc_test(
-    name = "bounded_utf8_length_sequence_test",
-    srcs = ["internal/bounded_utf8_length_sequence_test.cc"],
+    name = "demangle_test",
+    srcs = ["internal/demangle_test.cc"],
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
         ":demangle_internal",
+        ":stack_consumption",
         "//absl/base:config",
+        "//absl/base:core_headers",
+        "//absl/log",
+        "//absl/memory",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
 )
 
+cc_library(
+    name = "bounded_utf8_length_sequence",
+    hdrs = ["internal/bounded_utf8_length_sequence.h"],
+    copts = ABSL_DEFAULT_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = [
+        "//absl/base:config",
+        "//absl/numeric:bits",
+    ],
+)
+
 cc_test(
-    name = "decode_rust_punycode_test",
-    srcs = ["internal/decode_rust_punycode_test.cc"],
+    name = "bounded_utf8_length_sequence_test",
+    srcs = ["internal/bounded_utf8_length_sequence_test.cc"],
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":demangle_internal",
+        ":bounded_utf8_length_sequence",
         "//absl/base:config",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
 )
 
+cc_library(
+    name = "decode_rust_punycode",
+    srcs = ["internal/decode_rust_punycode.cc"],
+    hdrs = ["internal/decode_rust_punycode.h"],
+    copts = ABSL_DEFAULT_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = [
+        ":bounded_utf8_length_sequence",
+        ":utf8_for_code_point",
+        "//absl/base:config",
+        "//absl/base:nullability",
+    ],
+)
+
 cc_test(
-    name = "demangle_rust_test",
-    srcs = ["internal/demangle_rust_test.cc"],
+    name = "decode_rust_punycode_test",
+    srcs = ["internal/decode_rust_punycode_test.cc"],
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":demangle_internal",
+        ":decode_rust_punycode",
         "//absl/base:config",
-        "//absl/base:core_headers",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
 )
 
+cc_library(
+    name = "demangle_rust",
+    srcs = ["internal/demangle_rust.cc"],
+    hdrs = ["internal/demangle_rust.h"],
+    copts = ABSL_DEFAULT_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = [
+        ":decode_rust_punycode",
+        "//absl/base:config",
+        "//absl/base:core_headers",
+    ],
+)
+
 cc_test(
-    name = "demangle_test",
-    srcs = ["internal/demangle_test.cc"],
+    name = "demangle_rust_test",
+    srcs = ["internal/demangle_rust_test.cc"],
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":demangle_internal",
-        ":stack_consumption",
+        ":demangle_rust",
         "//absl/base:config",
         "//absl/base:core_headers",
-        "//absl/log",
-        "//absl/memory",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
 )
 
+cc_library(
+    name = "utf8_for_code_point",
+    srcs = ["internal/utf8_for_code_point.cc"],
+    hdrs = ["internal/utf8_for_code_point.h"],
+    copts = ABSL_DEFAULT_COPTS,
+    linkopts = ABSL_DEFAULT_LINKOPTS,
+    deps = ["//absl/base:config"],
+)
+
 cc_test(
     name = "utf8_for_code_point_test",
     srcs = ["internal/utf8_for_code_point_test.cc"],
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":demangle_internal",
+        ":utf8_for_code_point",
         "//absl/base:config",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",