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 /config.m4 | |
| parent | 57c52eebce27bd104ae130e72c3833f361b11919 (diff) | |
| parent | 5262c087d88123c0f69603f42b6401a4b8fa9282 (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'config.m4')
| -rw-r--r-- | config.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -257,10 +257,10 @@ if test "$PHP_GRPC" != "no"; then 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 \ @@ -641,6 +641,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/oauth2) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/plugin) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/ssl) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/transport) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/util) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice) |