Added google/protobuf/descriptor.upb.* to core.

This is in preparation for making upb_def capable
of parsing binary descriptors directly.

We leave upb/descriptor/descriptor.upbdefs.* in
place for now, because upb/descriptor/reader.*
still depends on it.

Also removed a bit of cruft from the codegen.

1 files changed, 2 insertions, 1 deletions

diff --git a/tools/amalgamate.py b/tools/amalgamate.py
index 6fd8033..b496f24 100755
--- a/tools/amalgamate.py
+++ b/tools/amalgamate.py
@@ -24,7 +24,8 @@ class Amalgamator:
   def _process_file(self, infile_name, outfile):
     for line in open(infile_name):
       include = parse_include(line)
-      if include is not None and include.startswith("upb"):
+      if include is not None and (include.startswith("upb") or
+                                  include.startswith("google")):
         if include not in self.included:
           self.included.add(include)
           self._add_header(self.include_path + include)