Split the JSON rules out of the main BUILD file and removed obsolete …

…forwarding headers PiperOrigin-RevId: 541016462
JasonLunn · Jun 16, 2023 · ba50073 · ba50073
1 parent ee24ef2
commit ba50073
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 146 deletions.
diff --git a/BUILD b/BUILD
@@ -743,29 +743,10 @@ cc_library(
     ],
 )
 
-# TODO(b/232091617): Once we can delete the deprecated forwarding headers
-# (= everything in upb/) we can move this build target down into json/
-cc_library(
+alias(
     name = "json",
-    srcs = [
-        "upb/json/decode.c",
-        "upb/json/encode.c",
-    ],
-    hdrs = [
-        "upb/json/decode.h",
-        "upb/json/encode.h",
-        "upb/json_decode.h",
-        "upb/json_encode.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
+    actual = "//upb/json",
     visibility = ["//visibility:public"],
-    deps = [
-        ":collections",
-        ":lex",
-        ":port",
-        ":reflection",
-        ":upb",
-    ],
 )
 
 # Tests ########################################################################
@@ -790,53 +771,6 @@ cc_test(
     ],
 )
 
-proto_library(
-    name = "json_test_proto",
-    testonly = 1,
-    srcs = ["upb/json/test.proto"],
-    deps = ["@com_google_protobuf//:struct_proto"],
-)
-
-upb_proto_library(
-    name = "json_test_upb_proto",
-    testonly = 1,
-    deps = [":json_test_proto"],
-)
-
-upb_proto_reflection_library(
-    name = "json_test_upb_proto_reflection",
-    testonly = 1,
-    deps = [":json_test_proto"],
-)
-
-cc_test(
-    name = "json_decode_test",
-    srcs = ["upb/json/decode_test.cc"],
-    deps = [
-        ":json",
-        ":json_test_upb_proto",
-        ":json_test_upb_proto_reflection",
-        ":reflection",
-        ":struct_upb_proto",
-        ":upb",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "json_encode_test",
-    srcs = ["upb/json/encode_test.cc"],
-    deps = [
-        ":json",
-        ":json_test_upb_proto",
-        ":json_test_upb_proto_reflection",
-        ":reflection",
-        ":struct_upb_proto",
-        ":upb",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_test(
     name = "collections_test",
     srcs = ["upb/collections/test.cc"],
@@ -856,6 +790,7 @@ cc_test(
         ":message_test_upb_proto_reflection",
         ":reflection",
         ":upb",
+        "//upb/json",
         "//upb/test:fuzz_util",
         "//upb/test:test_messages_proto3_upb_proto",
         "@com_google_googletest//:gtest_main",
@@ -881,11 +816,6 @@ upb_proto_reflection_library(
     deps = [":message_test_proto"],
 )
 
-upb_proto_library(
-    name = "struct_upb_proto",
-    deps = ["@com_google_protobuf//:struct_proto"],
-)
-
 cc_test(
     name = "atoi_test",
     srcs = ["upb/lex/atoi_test.cc"],

diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py
@@ -227,6 +227,9 @@ def bootstrap_upb_proto_library(self, **kwargs):
   def bootstrap_cc_library(self, **kwargs):
     pass
 
+  def alias(self, **kwargs):
+    pass
+
 
 class WorkspaceFileFunctions(object):
   def __init__(self, converter):

diff --git a/upb/conformance/BUILD b/upb/conformance/BUILD
@@ -92,6 +92,7 @@ cc_binary(
         "//:reflection",
         "//:textformat",
         "//:wire",
+        "//upb/json",
     ],
 )
 
@@ -141,6 +142,7 @@ cc_binary(
         "//:reflection",
         "//:textformat",
         "//:wire",
+        "//upb/json",
     ],
 )
 

diff --git a/upb/json/BUILD b/upb/json/BUILD
@@ -0,0 +1,84 @@
+# TODO(haberman): describe this package.
+
+load(
+    "//bazel:build_defs.bzl",
+    "UPB_DEFAULT_COPTS",
+)
+load(
+    "//bazel:upb_proto_library.bzl",
+    "upb_proto_library",
+    "upb_proto_reflection_library",
+)
+
+cc_library(
+    name = "json",
+    srcs = [
+        "decode.c",
+        "encode.c",
+    ],
+    hdrs = [
+        "decode.h",
+        "encode.h",
+    ],
+    copts = UPB_DEFAULT_COPTS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//:collections",
+        "//:lex",
+        "//:port",
+        "//:reflection",
+        "//:upb",
+    ],
+)
+
+cc_test(
+    name = "encode_test",
+    srcs = ["encode_test.cc"],
+    deps = [
+        ":json",
+        ":json_test_upb_proto",
+        ":json_test_upb_proto_reflection",
+        ":struct_upb_proto",
+        "//:reflection",
+        "//:upb",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+proto_library(
+    name = "json_test_proto",
+    testonly = 1,
+    srcs = ["test.proto"],
+    deps = ["@com_google_protobuf//:struct_proto"],
+)
+
+upb_proto_library(
+    name = "json_test_upb_proto",
+    testonly = 1,
+    deps = [":json_test_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "json_test_upb_proto_reflection",
+    testonly = 1,
+    deps = [":json_test_proto"],
+)
+
+cc_test(
+    name = "json_decode_test",
+    srcs = ["decode_test.cc"],
+    deps = [
+        ":json",
+        ":json_test_upb_proto",
+        ":json_test_upb_proto_reflection",
+        ":struct_upb_proto",
+        "//:reflection",
+        "//:upb",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+upb_proto_library(
+    name = "struct_upb_proto",
+    deps = ["@com_google_protobuf//:struct_proto"],
+)
diff --git a/upb/json_decode.h b/upb/json_decode.h
diff --git a/upb/json_encode.h b/upb/json_encode.h
diff --git a/upb/test/BUILD b/upb/test/BUILD
@@ -169,6 +169,7 @@ cc_test(
         "//:json",
         "//:port",
         "//:reflection",
+        "//upb/json",
         "@com_google_googletest//:gtest_main",
     ],
 )

diff --git a/upb/util/required_fields_test.cc b/upb/util/required_fields_test.cc
@@ -30,7 +30,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/strings/string_view.h"
-#include "upb/json_decode.h"
+#include "upb/json/decode.h"
 #include "upb/reflection/def.hpp"
 #include "upb/upb.hpp"
 #include "upb/util/required_fields_test.upb.h"

diff --git a/upbc/BUILD b/upbc/BUILD
@@ -228,6 +228,7 @@ cc_library(
         "//:mini_table",
         "//:port",
         "//:reflection",
+        "//upb/json",
     ],
 )