More Blaze fixes.

BUILD

@@ -242,7 +242,7 @@ cc_library(
 cc_test(
     name = "test_varint",
     srcs = [
-        "tests/pb/test_varint.c" +
+        "tests/pb/test_varint.c",
         "upb/pb/varint.int.h",
     ],
     copts = COPTS,

CMakeLists.txt

@@ -98,6 +98,7 @@ add_library(handlers
   upb/sink.h)
 target_link_libraries(handlers
   reflection
+  table
   upb)
 add_library(upb_pb
   upb/pb/compile_decoder.c

build_defs.bzl

@@ -356,7 +356,7 @@ def _upb_proto_rule_impl(ctx):
 def _upb_proto_aspect_impl(target, ctx):
     proto_info = target[ProtoInfo]
     files = _compile_upb_protos(ctx, proto_info, proto_info.direct_sources, ctx.attr._ext)
-    deps = ctx.rule.attr.deps + [ctx.attr._upb]
+    deps = ctx.rule.attr.deps + ctx.attr._upb
     dep_ccinfos = [dep[CcInfo] for dep in deps if CcInfo in dep]
     dep_ccinfos += [dep[_WrappedCcInfo].cc_info for dep in deps if _WrappedCcInfo in dep]
     cc_info = cc_library_func(
@@ -394,7 +394,7 @@ _upb_proto_library_aspect = aspect(
         "_cc_toolchain": attr.label(
             default = "@bazel_tools//tools/cpp:current_cc_toolchain",
         ),
-        "_upb": attr.label(default = ":upb"),
+        "_upb": attr.label_list(default = [":upb"]),
         "_ext": attr.string(default = ".upb"),
     }),
     implementation = _upb_proto_aspect_impl,
@@ -431,7 +431,12 @@ _upb_proto_reflection_library_aspect = aspect(
         "_cc_toolchain": attr.label(
             default = "@bazel_tools//tools/cpp:current_cc_toolchain",
         ),
-        "_upb": attr.label(default = ":reflection"),
+        "_upb": attr.label_list(
+            default = [
+                ":upb",
+                ":reflection",
+            ],
+        ),
         "_ext": attr.string(default = ".upbdefs"),
     }),
     implementation = _upb_proto_aspect_impl,