diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
| commit | a8453a20d8565ad63ca9ebcdc1b981400a7b09a0 (patch) | |
| tree | b554248cd31da09f9120ead2fe9e6eca23ccfa68 /CMakeLists.txt | |
| parent | 57c52eebce27bd104ae130e72c3833f361b11919 (diff) | |
| parent | 5262c087d88123c0f69603f42b6401a4b8fa9282 (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d0da03f6b..3be61e2f07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -958,10 +958,10 @@ add_library(grpc src/core/lib/security/credentials/oauth2/oauth2_credentials.cc src/core/lib/security/credentials/plugin/plugin_credentials.cc src/core/lib/security/credentials/ssl/ssl_credentials.cc + src/core/lib/security/security_connector/security_connector.cc src/core/lib/security/transport/client_auth_filter.cc src/core/lib/security/transport/lb_targets_info.cc src/core/lib/security/transport/secure_endpoint.cc - src/core/lib/security/transport/security_connector.cc src/core/lib/security/transport/security_handshaker.cc src/core/lib/security/transport/server_auth_filter.cc src/core/lib/security/transport/tsi_error.cc @@ -1322,10 +1322,10 @@ add_library(grpc_cronet src/core/lib/security/credentials/oauth2/oauth2_credentials.cc src/core/lib/security/credentials/plugin/plugin_credentials.cc src/core/lib/security/credentials/ssl/ssl_credentials.cc + src/core/lib/security/security_connector/security_connector.cc src/core/lib/security/transport/client_auth_filter.cc src/core/lib/security/transport/lb_targets_info.cc src/core/lib/security/transport/secure_endpoint.cc - src/core/lib/security/transport/security_connector.cc src/core/lib/security/transport/security_handshaker.cc src/core/lib/security/transport/server_auth_filter.cc src/core/lib/security/transport/tsi_error.cc |