diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc index 205ebc7872f..cf8dcd7d7c9 100644 --- a/src/cpp/server/secure_server_credentials.cc +++ b/src/cpp/server/secure_server_credentials.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include "src/cpp/common/secure_auth_context.h" @@ -149,6 +150,7 @@ std::shared_ptr LocalServerCredentials( std::shared_ptr TlsServerCredentials( const TlsCredentialsOptions& options) { + grpc::GrpcLibraryCodegen init; return std::shared_ptr(new SecureServerCredentials( grpc_tls_server_credentials_create(options.c_credentials_options()))); } diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 1980ca5eddf..98c2172c516 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -682,7 +682,6 @@ TEST_F(CredentialsTest, LoadTlsChannelCredentials) { // This test demonstrates how the TLS credentials will be used to create // server credentials. TEST_F(CredentialsTest, LoadTlsServerCredentials) { - grpc_init(); std::shared_ptr test_credential_reload( new TestTlsCredentialReload()); std::shared_ptr credential_reload_config( @@ -694,7 +693,6 @@ TEST_F(CredentialsTest, LoadTlsServerCredentials) { std::shared_ptr<::grpc_impl::ServerCredentials> server_credentials = grpc::experimental::TlsServerCredentials(options); GPR_ASSERT(server_credentials.get() != nullptr); - grpc_shutdown(); } TEST_F(CredentialsTest, TlsCredentialReloadConfigErrorMessages) {