diff options
| author |  Matt Kwong <matt-kwong@users.noreply.github.com> | 2018-02-23 16:59:30 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-23 16:59:30 -0800 |
| commit | d5b1f9809202bf2338f94a9e1c07bc511b42d67d (patch) | |
| tree | 9ceb6fc127471f92ee626f91fbbd9925e9874d45 /src | |
| parent | 5739d34c469f7ffb5f74cbc8308b182d3fad3664 (diff) | |
| parent | 01e5057190fb2444dc8de978cc25c51c0ba44f88 (diff) | |
Merge pull request #14518 from grpc/v1.10.x
Include Boringssl fips_fragments files in headers for building (upmerge from v1.10.x)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/boringssl/gen_build_yaml.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/boringssl/gen_build_yaml.py b/src/boringssl/gen_build_yaml.py index 221cbe7fd5..593b66dc4d 100755 --- a/src/boringssl/gen_build_yaml.py +++ b/src/boringssl/gen_build_yaml.py @@ -67,7 +67,9 @@ class Grpc(object): ), 'headers': sorted( map_dir(f) - for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers'] + # We want to include files['fips_fragments'], but not build them as objects. + # See https://boringssl-review.googlesource.com/c/boringssl/+/16946 + for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers'] + files['fips_fragments'] ), 'boringssl': True, 'defaults': 'boringssl', |