diff options
| author |  nnoble <nnoble@google.com> | 2015-01-12 18:40:46 -0800 |
|---|---|---|
| committer | Nicolas Noble <nnoble@google.com> | 2015-01-12 18:46:33 -0800 |
| commit | 472f60edac466843148fa46e7b18a972c85d5b64 (patch) | |
| tree | fa95ede29a8679c8626739116e4ebd09281983fe | |
| parent | 6ad120e435069656af0394dc0b97744701cac51c (diff) | |
Fixing opensource build.
Change on 2015/01/12 by nnoble <nnoble@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83810001
| -rw-r--r-- | build.json | 3 | ||||
| -rw-r--r-- | src/cpp/client/credentials.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_credentials.cc | 2 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 1 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_unsecure.vcxproj | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/build.json b/build.json index 659b24d076..385e2c9675 100644 --- a/build.json +++ b/build.json @@ -282,8 +282,7 @@ "src/core/tsi/fake_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/transport_security.h", - "src/core/tsi/transport_security_interface.h", - "src/core/tsi/transport_security_test_lib.h" + "src/core/tsi/transport_security_interface.h" ], "deps": [ "gpr" diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials.cc index 430582b263..cac1d3d106 100644 --- a/src/cpp/client/credentials.cc +++ b/src/cpp/client/credentials.cc @@ -34,7 +34,7 @@ #include <string> -#include <grpc/grpc_security_google.h> +#include <grpc/grpc_security.h> #include <grpc/support/log.h> #include <grpc++/credentials.h> diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc index fe6c8f9a98..f9ca1622ba 100644 --- a/src/cpp/server/server_credentials.cc +++ b/src/cpp/server/server_credentials.cc @@ -32,7 +32,7 @@ */ -#include <grpc/grpc_security_google.h> +#include <grpc/grpc_security.h> #include <grpc++/server_credentials.h> diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 9a8c0e2edd..9f3ec8c597 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -91,7 +91,6 @@ <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" /> <ClInclude Include="..\..\src\core\tsi\transport_security.h" /> <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" /> - <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" /> <ClInclude Include="..\..\src\core\channel\census_filter.h" /> <ClInclude Include="..\..\src\core\channel\channel_args.h" /> <ClInclude Include="..\..\src\core\channel\channel_stack.h" /> diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 9a8c0e2edd..9f3ec8c597 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -91,7 +91,6 @@ <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" /> <ClInclude Include="..\..\src\core\tsi\transport_security.h" /> <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" /> - <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" /> <ClInclude Include="..\..\src\core\channel\census_filter.h" /> <ClInclude Include="..\..\src\core\channel\channel_args.h" /> <ClInclude Include="..\..\src\core\channel\channel_stack.h" /> |