From 9f11b1454b77337d23c6a0acff43b45e33270380 Mon Sep 17 00:00:00 2001
From: Eric Salo <salo@google.com>
Date: Tue, 26 Dec 2023 14:58:57 -0800
Subject: [PATCH] upb: restore the mini_table:internal target

PiperOrigin-RevId: 593861882
---
 upb/BUILD                 |  5 +++++
 upb/message/BUILD         |  2 ++
 upb/mini_descriptor/BUILD |  1 +
 upb/mini_table/BUILD      | 25 +++++++++++++++++++++----
 upb/wire/BUILD            |  1 +
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/upb/BUILD b/upb/BUILD
index 094054b14783e..6ac5299826ce2 100644
--- a/upb/BUILD
+++ b/upb/BUILD
@@ -396,6 +396,7 @@ upb_amalgamation(
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/mini_table:internal",
     ],
     strip_import_prefix = ["src"],
 )
@@ -437,12 +438,14 @@ upb_amalgamation(
         ":mini_descriptor",
         ":mini_descriptor_internal",
         ":mini_table",
+        ":mini_table_compat",
         ":port",
         ":reflection",
         ":reflection_internal",
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/mini_table:internal",
     ],
     prefix = "php-",
     strip_import_prefix = ["src"],
@@ -485,12 +488,14 @@ upb_amalgamation(
         ":mini_descriptor",
         ":mini_descriptor_internal",
         ":mini_table",
+        ":mini_table_compat",
         ":port",
         ":reflection",
         ":reflection_internal",
         ":wire",
         ":wire_reader",
         "//upb/mem:internal",
+        "//upb/mini_table:internal",
     ],
     prefix = "ruby-",
     strip_import_prefix = ["src"],
diff --git a/upb/message/BUILD b/upb/message/BUILD
index 6a2660ace90c4..cfb883e24e90f 100644
--- a/upb/message/BUILD
+++ b/upb/message/BUILD
@@ -82,6 +82,7 @@ cc_library(
         "//upb:mem",
         "//upb:mini_table",
         "//upb:port",
+        "//upb/mini_table:internal",
     ],
 )
 
@@ -119,6 +120,7 @@ cc_library(
         "//upb:mem",
         "//upb:mini_table",
         "//upb:port",
+        "//upb/mini_table:internal",
     ],
 )
 
diff --git a/upb/mini_descriptor/BUILD b/upb/mini_descriptor/BUILD
index 9ea571e6bbe28..fafcf419c931e 100644
--- a/upb/mini_descriptor/BUILD
+++ b/upb/mini_descriptor/BUILD
@@ -25,6 +25,7 @@ cc_library(
         "//upb:mem",
         "//upb:mini_table",
         "//upb:port",
+        "//upb/mini_table:internal",
     ],
 )
 
diff --git a/upb/mini_table/BUILD b/upb/mini_table/BUILD
index 4c73d1c39a453..7fb1c1693ebf7 100644
--- a/upb/mini_table/BUILD
+++ b/upb/mini_table/BUILD
@@ -14,7 +14,6 @@ cc_library(
     name = "mini_table",
     srcs = [
         "extension_registry.c",
-        "internal/message.c",
         "message.c",
     ],
     hdrs = [
@@ -23,6 +22,27 @@ cc_library(
         "extension_registry.h",
         "field.h",
         "file.h",
+        "message.h",
+        "sub.h",
+        "types.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":internal",
+        "//upb:base",
+        "//upb:hash",
+        "//upb:mem",
+        "//upb:port",
+    ],
+)
+
+cc_library(
+    name = "internal",
+    srcs = [
+        "internal/message.c",
+    ],
+    hdrs = [
         "internal/enum.h",
         "internal/extension.h",
         "internal/field.h",
@@ -30,9 +50,6 @@ cc_library(
         "internal/message.h",
         "internal/size_log2.h",
         "internal/sub.h",
-        "message.h",
-        "sub.h",
-        "types.h",
     ],
     copts = UPB_DEFAULT_COPTS,
     visibility = ["//visibility:public"],
diff --git a/upb/wire/BUILD b/upb/wire/BUILD
index e415a1894de1c..3e93221067a21 100644
--- a/upb/wire/BUILD
+++ b/upb/wire/BUILD
@@ -38,6 +38,7 @@ cc_library(
         "//upb:mini_table",
         "//upb:port",
         "//upb/mem:internal",
+        "//upb/mini_table:internal",
         "//third_party/utf8_range",
     ],
 )