From cea737028f7d34e6415c0de5d34587245624db2b Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Wed, 7 Mar 2018 16:30:21 -0800 Subject: 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. --- tools/amalgamate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/amalgamate.py') 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) -- cgit v1.2.3