diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-03-07 17:04:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 17:04:39 -0800 |
| commit | 9dbe75a403cc501700bc785185af8cbca870a2cb (patch) | |
| tree | 7b4716b894b488a414c6e57881fc2b6993392090 /tools/amalgamate.py | |
| parent | 681cf4279c152e60e67989b83134018c7058f874 (diff) | |
| parent | cea737028f7d34e6415c0de5d34587245624db2b (diff) | |
Merge pull request #102 from haberman/descriptor-in-core
Added google/protobuf/descriptor.upb.* to core.
Diffstat (limited to 'tools/amalgamate.py')
| -rwxr-xr-x | tools/amalgamate.py | 3 |
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) |