Merge branch 'master' into import
diff --git a/build.yaml b/build.yaml
index d41f419..2d9cdb6 100644
--- a/build.yaml
+++ b/build.yaml
@@ -141,11 +141,6 @@
- include/grpc/impl/codegen/sync_posix.h
- include/grpc/impl/codegen/sync_windows.h
- include/grpc/impl/codegen/time.h
-- name: grpc++_codegen_base_src
- src:
- - src/cpp/codegen/codegen_init.cc
- uses:
- - grpc++_codegen_base
- name: grpc_base
public_headers:
- include/grpc/byte_buffer.h
@@ -753,6 +748,12 @@
- include/grpc++/impl/codegen/time.h
uses:
- grpc_codegen
+- name: grpc++_codegen_base_src
+ language: c++
+ src:
+ - src/cpp/codegen/codegen_init.cc
+ uses:
+ - grpc++_codegen_base
- name: grpc++_codegen_proto
language: c++
public_headers:
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 57e3bd6..ec3847a 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5681,19 +5681,6 @@
},
{
"deps": [
- "grpc++_codegen_base"
- ],
- "headers": [],
- "language": "c",
- "name": "grpc++_codegen_base_src",
- "src": [
- "src/cpp/codegen/codegen_init.cc"
- ],
- "third_party": false,
- "type": "filegroup"
- },
- {
- "deps": [
"gpr",
"grpc_codegen"
],
@@ -6722,6 +6709,19 @@
},
{
"deps": [
+ "grpc++_codegen_base"
+ ],
+ "headers": [],
+ "language": "c++",
+ "name": "grpc++_codegen_base_src",
+ "src": [
+ "src/cpp/codegen/codegen_init.cc"
+ ],
+ "third_party": false,
+ "type": "filegroup"
+ },
+ {
+ "deps": [
"grpc++_codegen_base",
"grpc++_config_proto"
],