commit 9e26b6c282e737c43cbdc5c8e4fd1857859a1625
author ncteisen <ncteisen@gmail.com> Tue Jun 19 13:51:28 2018 -0700
committer ncteisen <ncteisen@gmail.com> Wed Jun 20 07:59:06 2018 -0700
tree 95ac9e627066e28f47e5fee2876e5ea3a89c7a4f
parent d170b83e0d29b93d3de7c508281cfeae38ae141e

Regenerate project and fix sanity

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 796dcd6..b0e5da8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11155,6 +11155,7 @@
   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

include/grpc/support/log.h

diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h
index cdf1886..8d8742b 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 */

tools/run_tests/generated/sources_and_headers.json

diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6870213..ded1589 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"

tools/run_tests/generated/tests.json

diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 3cc0974..cb0fb34 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",