Changed include orders to remove dependency of grpc++_base_unsecure library on grpc_security.h.

BUILD

@@ -263,6 +263,7 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/security/credentials_impl.h",
     "include/grpcpp/security/server_credentials.h",
     "include/grpcpp/security/server_credentials_impl.h",
+    "include/grpcpp/security/tls_credentials_options.h",
     "include/grpcpp/server.h",
     "include/grpcpp/server_impl.h",
     "include/grpcpp/server_builder.h",
@@ -300,10 +301,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/support/validate_service_config.h",
 ]
 
-GRPCXX_SECURE_PUBLIC_HDRS = [
-    "include/grpcpp/security/tls_credentials_options.h",
-]
-
 grpc_cc_library(
     name = "gpr",
     language = "c++",
@@ -376,11 +373,12 @@ grpc_cc_library(
         "src/cpp/server/secure_server_credentials.h",
     ],
     language = "c++",
-    public_hdrs = GRPCXX_PUBLIC_HDRS + GRPCXX_SECURE_PUBLIC_HDRS,
+    public_hdrs = GRPCXX_PUBLIC_HDRS,
     standalone = True,
     deps = [
         "gpr",
         "grpc",
+        "grpc_secure",
         "grpc++_base",
         "grpc++_codegen_base",
         "grpc++_codegen_base_src",

include/grpcpp/security/tls_credentials_options.h

@@ -22,7 +22,7 @@
 #include <memory>
 #include <vector>
 
-#include <grpc/grpc_security.h>
+//#include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 #include <grpcpp/support/config.h>
 
@@ -57,6 +57,8 @@ class TlsKeyMaterialsConfig {
   grpc::string pem_root_certs_;
 };
 
+typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg;
+
 /** TLS credential reload arguments, wraps grpc_tls_credential_reload_arg. It is
  * used for experimental purposes for now and it is subject to change.
  *
@@ -101,6 +103,8 @@ class TlsCredentialReloadArg {
   grpc_tls_credential_reload_arg* c_arg_;
 };
 
+typedef struct grpc_tls_credential_reload_config grpc_tls_credential_reload_config;
+
 /** TLS credential reloag config, wraps grpc_tls_credential_reload_config. It is
  * used for experimental purposes for now and it is subject to change.
  *
@@ -147,6 +151,8 @@ class TlsCredentialReloadConfig {
   void (*destruct_)(void* config_user_data);
 };
 
+typedef struct grpc_tls_server_authorization_check_arg grpc_tls_server_authorization_check_arg;
+
 /** TLS server authorization check arguments, wraps
  *  grpc_tls_server_authorization_check_arg. It is used for experimental
  *  purposes for now and it is subject to change.
@@ -194,6 +200,8 @@ class TlsServerAuthorizationCheckArg {
   grpc_tls_server_authorization_check_arg* c_arg_;
 };
 
+typedef struct grpc_tls_server_authorization_check_config grpc_tls_server_authorization_check_config;
+
 /** TLS server authorization check config, wraps
  *  grps_tls_server_authorization_check_config. It is used for experimental
  *  purposes for now and it is subject to change.
@@ -246,6 +254,8 @@ class TlsServerAuthorizationCheckConfig {
   void (*destruct_)(void* config_user_data);
 };
 
+typedef struct grpc_tls_credentials_options grpc_tls_credentials_options;
+
 /** TLS credentials options, wrapper for grpc_tls_credentials_options. It is
  * used for experimental purposes for now and it is subject to change. See the
  * description of the grpc_tls_credentials_options struct in grpc_security.h for

src/cpp/common/tls_credentials_options.cc

@@ -16,9 +16,9 @@
  *
  */
 
+#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 #include <grpcpp/security/tls_credentials_options.h>
 
-#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 #include "src/cpp/common/tls_credentials_options_util.h"
 
 namespace grpc_impl {