From 83302c759e6d816301af54932d184fb51258d686 Mon Sep 17 00:00:00 2001
From: Matthew Stevenson <mattstev@google.com>
Date: Thu, 1 Aug 2019 08:39:28 -0700
Subject: [PATCH] Added secure public header to grpc++_unsecure dependencies

---
 BUILD                                              | 3 ++-
 CMakeLists.txt                                     | 1 +
 Makefile                                           | 1 +
 build.yaml                                         | 4 ++++
 tools/run_tests/generated/sources_and_headers.json | 8 ++++++--
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/BUILD b/BUILD
index dadc1550a9b..af411526c31 100644
--- a/BUILD
+++ b/BUILD
@@ -388,6 +388,7 @@ grpc_cc_library(
         "src/cpp/server/insecure_server_credentials.cc",
     ],
     language = "c++",
+    public_hdrs= GRPC_SECURE_PUBLIC_HDRS,
     standalone = True,
     deps = [
         "gpr",
@@ -2013,7 +2014,7 @@ grpc_cc_library(
     srcs = GRPCXX_SRCS,
     hdrs = GRPCXX_HDRS,
     language = "c++",
-    public_hdrs = GRPCXX_PUBLIC_HDRS,
+    public_hdrs = GRPCXX_PUBLIC_HDRS + GRPC_SECURE_PUBLIC_HDRS,
     deps = [
         "grpc++_codegen_base",
         "grpc_unsecure",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb863dc8416..4e60b6f816d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4224,6 +4224,7 @@ target_link_libraries(grpc++_unsecure
 )
 
 foreach(_hdr
+  include/grpc/grpc_security.h
   include/grpc++/alarm.h
   include/grpc++/channel.h
   include/grpc++/client_context.h
diff --git a/Makefile b/Makefile
index e4eb3c51f60..01f5e55c41d 100644
--- a/Makefile
+++ b/Makefile
@@ -6534,6 +6534,7 @@ LIBGRPC++_UNSECURE_SRC = \
     src/cpp/codegen/codegen_init.cc \
 
 PUBLIC_HEADERS_CXX += \
+    include/grpc/grpc_security.h \
     include/grpc++/alarm.h \
     include/grpc++/channel.h \
     include/grpc++/client_context.h \
diff --git a/build.yaml b/build.yaml
index 7c4a6cb37e4..bc97b03084b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -257,6 +257,8 @@ filegroups:
   - grpc++_common
   - grpc++_codegen_base
 - name: grpc++_base_unsecure
+  public_headers:
+  - include/grpc/grpc_security.h
   deps:
   - grpc_unsecure
   uses:
@@ -1953,6 +1955,8 @@ libs:
   - grpc++_base_unsecure
   - grpc++_codegen_base
   - grpc++_codegen_base_src
+  public headers:
+  - include/grpc/grpc_security.h
   secure: false
 - name: grpc_benchmark
   build: test
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 15f8d90b792..f91cbfe0814 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8543,11 +8543,15 @@
       "grpc++_common", 
       "grpc_unsecure"
     ], 
-    "headers": [], 
+    "headers": [
+      "include/grpc/grpc_security.h"
+    ], 
     "is_filegroup": true, 
     "language": "c", 
     "name": "grpc++_base_unsecure", 
-    "src": [], 
+    "src": [
+      "include/grpc/grpc_security.h"
+    ], 
     "third_party": false, 
     "type": "filegroup"
   },