Merge pull request #523 from haberman/fix-sync2

Make remaining tests work with the sync.

upb/util/BUILD

@@ -25,7 +25,7 @@ proto_library(
         "def_to_proto_public_import_test.proto",
         "def_to_proto_regular_import_test.proto",
         "def_to_proto_test.proto",
-        "def_to_proto_weak_import_test.proto",
+        "def_to_proto_weak_import_test.proto",  # copybara:strip_for_google3
     ],
 )
 
@@ -47,6 +47,8 @@ cc_test(
         ":def_to_proto_test_upb_proto",
         ":def_to_proto_test_upb_proto_reflection",
         "//:descriptor_upb_proto_reflection",
+        "//:reflection",
+        "//:upb",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",

upb/util/def_to_proto_public_import_test.proto

@@ -26,3 +26,7 @@
  */
 
 syntax = "proto3";
+
+package pkg;
+
+message PublicImportMessage {}

upb/util/def_to_proto_regular_import_test.proto

@@ -26,3 +26,7 @@
  */
 
 syntax = "proto3";
+
+package pkg;
+
+message RegularImportMessage {}

upb/util/def_to_proto_test.proto

@@ -29,7 +29,7 @@ syntax = "proto2";
 
 import "upb/util/def_to_proto_regular_import_test.proto";
 import public "upb/util/def_to_proto_public_import_test.proto";
-import weak "upb/util/def_to_proto_weak_import_test.proto";
+import weak "upb/util/def_to_proto_weak_import_test.proto";  // copybara:strip_for_google3
 
 package pkg;
 
@@ -48,6 +48,8 @@ message Message {
     string oneof_bool = 3 [default = "true"];
     bytes oneof_bytes = 4 [default = "abc\xef\xfe"];
   }
+  optional pkg.RegularImportMessage regular_import_message = 6;
+  optional pkg.PublicImportMessage public_import_message = 7;
   extensions 1000 to max;
   extend Message {
     optional int32 ext = 1000;