Merge branch 'master' into maps

BUILD

@@ -100,6 +100,8 @@ cc_library(
     name = "generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
     hdrs = [
         "upb/msg.h",
+        "upb/port_def.inc",
+        "upb/port_undef.inc",
     ],
     copts = select({
         ":windows": [],
@@ -107,7 +109,6 @@ cc_library(
     }),
     visibility = ["//visibility:public"],
     deps = [
-        ":port",
         ":upb",
     ],
 )
@@ -135,6 +136,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":descriptor_upbproto",
+        ":port",
         ":table",
         ":upb",
     ],
@@ -170,6 +172,7 @@ cc_library(
     }),
     deps = [
         ":reflection",
+        ":port",
         ":table",
         ":upb",
     ],
@@ -199,6 +202,7 @@ cc_library(
         ":descriptor_upbproto",
         ":handlers",
         ":reflection",
+        ":port",
         ":table",
         ":upb",
     ],
@@ -234,6 +238,7 @@ cc_library(
     deps = [
         ":descriptor_upbproto",
         ":handlers",
+        ":port",
         ":upb",
     ],
 )
@@ -312,6 +317,7 @@ cc_library(
     }),
     deps = [
         ":handlers",
+        ":port",
         ":upb",
     ],
 )
@@ -327,6 +333,7 @@ cc_test(
         "//conditions:default": COPTS
     }),
     deps = [
+        ":port",
         ":upb",
         ":upb_pb",
         ":upb_test",
@@ -366,6 +373,7 @@ cc_test(
     }),
     deps = [
         ":handlers",
+        ":port",
         ":test_decoder_upbproto",
         ":upb",
         ":upb_pb",
@@ -394,6 +402,7 @@ cc_test(
     }),
     deps = [
         ":handlers",
+        ":port",
         ":reflection",
         ":test_cpp_upbproto",
         ":upb",
@@ -410,6 +419,7 @@ cc_test(
         "//conditions:default": CPPOPTS
     }),
     deps = [
+        ":port",
         ":table",
         ":upb",
         ":upb_test",

CMakeLists.txt

@@ -77,7 +77,6 @@ target_link_libraries(upb
   port)
 add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE)
 target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
-  port
   upb)
 add_library(reflection
   upb/def.c
@@ -86,6 +85,7 @@ add_library(reflection
   upb/reflection.h)
 target_link_libraries(reflection
   descriptor_upbproto
+  port
   table
   upb)
 add_library(table INTERFACE)
@@ -100,6 +100,7 @@ add_library(handlers
   upb/sink.h)
 target_link_libraries(handlers
   reflection
+  port
   table
   upb)
 add_library(upb_pb
@@ -117,6 +118,7 @@ target_link_libraries(upb_pb
   descriptor_upbproto
   handlers
   reflection
+  port
   table
   upb)
 add_library(upb_json
@@ -131,6 +133,7 @@ add_library(upb_cc_bindings INTERFACE)
 target_link_libraries(upb_cc_bindings INTERFACE
   descriptor_upbproto
   handlers
+  port
   upb)
 add_library(upb_test
   tests/testmain.cc
@@ -138,6 +141,7 @@ add_library(upb_test
   tests/upb_test.h)
 target_link_libraries(upb_test
   handlers
+  port
   upb)
 
 

bazel/upb_proto_library.bzl

@@ -265,7 +265,7 @@ _upb_proto_library_aspect = aspect(
         ),
         "_upb": attr.label_list(default = [
             "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-            "//:upb"
+            "//:upb",
         ]),
         "_ext": attr.string(default = ".upb"),
     }),
@@ -311,6 +311,7 @@ _upb_proto_reflection_library_aspect = aspect(
         # For unknown reasons, this gets overwritten.
         "_upb": attr.label_list(
             default = [
+                "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
                 "//:upb",
                 "//:reflection",
             ],