Skip to content
Snippets Groups Projects
Commit 224b04f6 authored by Craig Tiller's avatar Craig Tiller
Browse files

Make this more robust against merges

parent fe8592ee
No related branches found
No related tags found
No related merge requests found
......@@ -20,8 +20,14 @@ def no_protos(src):
${json.dumps([{"name": tgt.name,
"language": tgt.language,
"src": no_protos(tgt.src) + tgt.get('public_headers', []) + tgt.get('headers', []),
"headers": tgt.get('public_headers', []) + tgt.get('headers', []) + proto_headers(tgt.src),
"deps": tgt.get('deps', [])}
"src": sorted(
no_protos(tgt.src) +
tgt.get('public_headers', []) +
tgt.get('headers', [])),
"headers": sorted(
tgt.get('public_headers', []) +
tgt.get('headers', []) +
proto_headers(tgt.src)),
"deps": sorted(tgt.get('deps', []))}
for tgt in (targets + libs)],
sort_keys=True, indent=2)}
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment