aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--include/grpc/support/log.h2
-rw-r--r--tools/run_tests/generated/sources_and_headers.json8
-rw-r--r--tools/run_tests/generated/tests.json4
4 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 796dcd6eb8..b0e5da8b0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11155,6 +11155,7 @@ target_include_directories(codegen_generic_end2end_test
PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+ PRIVATE ${_gRPC_NANOPB_INCLUDE_DIR}
PRIVATE third_party/googletest/googletest/include
PRIVATE third_party/googletest/googletest
PRIVATE third_party/googletest/googlemock/include
diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h
index cdf1886084..8d8742b95d 100644
--- a/include/grpc/support/log.h
+++ b/include/grpc/support/log.h
@@ -19,6 +19,8 @@
#ifndef GRPC_SUPPORT_LOG_H
#define GRPC_SUPPORT_LOG_H
+#include <grpc/support/port_platform.h>
+
#include <grpc/impl/codegen/log.h>
#endif /* GRPC_SUPPORT_LOG_H */
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6870213c46..ded1589ea2 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -3260,9 +3260,9 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "codegen_generic_end2end_test",
+ "name": "client_lb_end2end_test",
"src": [
- "test/cpp/end2end/codegen_generic_end2end_test.cc"
+ "test/cpp/end2end/client_lb_end2end_test.cc"
],
"third_party": false,
"type": "target"
@@ -3279,9 +3279,9 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "client_lb_end2end_test",
+ "name": "codegen_generic_end2end_test",
"src": [
- "test/cpp/end2end/client_lb_end2end_test.cc"
+ "test/cpp/end2end/codegen_generic_end2end_test.cc"
],
"third_party": false,
"type": "target"
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 3cc0974302..cb0fb34f4c 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3870,7 +3870,7 @@
"flaky": false,
"gtest": true,
"language": "c++",
- "name": "codegen_generic_end2end_test",
+ "name": "client_lb_end2end_test",
"platforms": [
"linux",
"mac",
@@ -3894,7 +3894,7 @@
"flaky": false,
"gtest": true,
"language": "c++",
- "name": "client_lb_end2end_test",
+ "name": "codegen_generic_end2end_test",
"platforms": [
"linux",
"mac",