Merge pull request #25312 from veblush/upb-dedup

Removing redundant files from upb yaml

CMakeLists.txt

@@ -3792,20 +3792,8 @@ add_library(upb
   third_party/upb/upb/table.c
   third_party/upb/upb/text_encode.c
   third_party/upb/upb/upb.c
-  src/core/ext/upb-generated/google/protobuf/any.upb.c
   src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
-  src/core/ext/upb-generated/google/protobuf/duration.upb.c
-  src/core/ext/upb-generated/google/protobuf/empty.upb.c
-  src/core/ext/upb-generated/google/protobuf/struct.upb.c
-  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
-  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
-  src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c
   src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c
-  src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c
 )
 
 set_target_properties(upb PROPERTIES

Makefile

@@ -2380,20 +2380,8 @@ LIBUPB_SRC = \
     third_party/upb/upb/table.c \
     third_party/upb/upb/text_encode.c \
     third_party/upb/upb/upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
     src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
     src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
 
 PUBLIC_HEADERS_C += \
 
@@ -2806,6 +2794,12 @@ src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/api/http.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DEP)

grpc.gyp

@@ -1986,20 +1986,8 @@
         'third_party/upb/upb/table.c',
         'third_party/upb/upb/text_encode.c',
         'third_party/upb/upb/upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
         'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
         'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
       ],
     },
     {

src/upb/gen_build_yaml.py

@@ -40,20 +40,8 @@ try:
             "third_party/upb/upb/table.c",
             "third_party/upb/upb/text_encode.c",
             "third_party/upb/upb/upb.c",
-            "src/core/ext/upb-generated/google/protobuf/any.upb.c",
             "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c",
-            "src/core/ext/upb-generated/google/protobuf/duration.upb.c",
-            "src/core/ext/upb-generated/google/protobuf/empty.upb.c",
-            "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
-            "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c",
-            "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c",
             "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c",
-            "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c",
         ],
         'headers': [
             "third_party/upb/upb/decode_fast.h",
@@ -74,20 +62,8 @@ try:
             "third_party/upb/upb/upb.hpp",
             "third_party/upb/upb/upb.int.h",
             "third_party/upb/third_party/wyhash/wyhash.h",
-            "src/core/ext/upb-generated/google/protobuf/any.upb.h",
             "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h",
-            "src/core/ext/upb-generated/google/protobuf/duration.upb.h",
-            "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
-            "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
-            "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h",
-            "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h",
             "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h",
-            "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h",
         ],
         'secure': False,
     }]