diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
| commit | 87a108121134e9603e3e60e732b23cbeb619be14 (patch) | |
| tree | f19efe6ed3dc6706b21fc9138a975fce74d66783 /templates/tools | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
| parent | 4f13db3c6cfaae52b6d7e35edaa352bccff70b66 (diff) | |
Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under
Diffstat (limited to 'templates/tools')
| -rw-r--r-- | templates/tools/run_tests/sources_and_headers.json.template | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/templates/tools/run_tests/sources_and_headers.json.template b/templates/tools/run_tests/sources_and_headers.json.template index 07559828dc..1c5c9747d6 100644 --- a/templates/tools/run_tests/sources_and_headers.json.template +++ b/templates/tools/run_tests/sources_and_headers.json.template @@ -37,6 +37,7 @@ ${json.dumps([{"name": tgt.name, "type": typ, + "is_filegroup": False, "language": tgt.language, "third_party": tgt.boringssl or tgt.zlib, "src": sorted( @@ -50,5 +51,22 @@ "deps": sorted(tgt.get('deps', []) + tgt.get('uses', []) + tgt.get('filegroups', []))} - for typ, tgt in all_targets(targets, libs, filegroups)], + for typ, tgt in all_targets(targets, libs, [])] + + [{"name": tgt.name, + "type": typ, + "is_filegroup": True, + "language": tgt.language, + "third_party": tgt.boringssl or tgt.zlib, + "src": sorted( + filter_srcs(tgt.own_src, (no_protos_filter, no_third_party_filter)) + + filter_srcs(tgt.own_public_headers, (no_protos_filter, no_third_party_filter)) + + filter_srcs(tgt.own_headers, (no_third_party_filter,))), + "headers": sorted( + tgt.own_public_headers + + tgt.own_headers + + proto_headers(tgt.own_src)), + "deps": sorted(tgt.get('deps', []) + + tgt.get('uses', []) + + tgt.get('filegroups', []))} + for typ, tgt in all_targets([], [], filegroups)], sort_keys=True, indent=2)} |