impl: convert pb.h files from system to local includes (#15229)

Author: scotthart

.bazelrc

@@ -18,6 +18,14 @@
 # Use host-OS-specific config lines from bazelrc files.
 build --enable_platform_specific_config=true
 
+build --features=external_include_paths
+
+build --per_file_copt=grpc+//@-Wno-private-header
+build --copt=-Wno-private-header
+build --cxxopt=-Wno-private-header
+build --host_copt=-Wno-private-header
+build --host_cxxopt=-Wno-private-header
+
 # The project requires C++ >= 17.
 build:linux --cxxopt=-std=c++17
 build:macos --cxxopt=-std=c++17
@@ -72,6 +80,8 @@ build:sanitizer --strip=never
 build:sanitizer --copt=-Og
 build:sanitizer --copt=-g
 build:sanitizer --copt=-fno-omit-frame-pointer
+#build:sanitizer --features=external_include_paths
+
 
 # --config asan: Address Sanitizer
 build:asan --config=sanitizer
@@ -104,6 +114,8 @@ build:ubsan --copt=-DCURL_STRICTER
 build:ubsan --linkopt=-fsanitize=undefined
 build:ubsan --linkopt=-fsanitize-link-c++-runtime
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
+#build:ubsan --features=external_include_paths
+
 
 # --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
 build:xsan --config=sanitizer

MODULE.bazel

@@ -51,7 +51,7 @@ python.toolchain(
     python_version = "3.11",
 )
 
-bazel_dep(name = "grpc", version = "1.71.0", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "grpc", version = "1.72.0", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
 archive_override(
     module_name = "googleapis",

bazel/googleapis.modules.patch

@@ -35,12 +35,12 @@ index 026553f5c7..f3c6b6925c 100644
 +# angle-brackets, thus treating their headers as system includes. This allows
 +# us to dial-up the warnings in our own code, without seeing compiler warnings
 +# from their headers, which we do not own.
-+cc_library(
-+    name = "googleapis_system_includes",
-+    includes = [
-+        ".",
-+    ],
-+)
++#cc_library(
++#    name = "googleapis_system_includes",
++#    includes = [
++#        ".",
++#    ],
++#)
 +
 diff --git a/MODULE.bazel b/MODULE.bazel
 new file mode 100644

bazel/workspace0.bzl

@@ -139,7 +139,7 @@ def gl_cpp_workspace0(name = None):
         ],
         sha256 = "a1b2315f7eb290e2876b19839da1cc7916b36f93c88921f90d0daab58755a8a3",
         strip_prefix = "googleapis-f9d6fe4a6ad9ed89dfc315f284124d2104377940",
-        build_file = Label("//bazel:googleapis.BUILD"),
+        # build_file = Label("//bazel:googleapis.BUILD"),
         # Scaffolding for patching googleapis after download. For example:
         #   patches = ["googleapis.patch"]
         # NOTE: This should only be used while developing with a new

generator/BUILD.bazel

@@ -37,7 +37,7 @@ cc_library(
         "@abseil-cpp//absl/strings:str_format",
         "@com_github_jbeder_yaml_cpp//:yaml-cpp",
         "@com_github_nlohmann_json//:json",
-        "@com_google_googleapis//:googleapis_system_includes",
+        #        "@com_google_googleapis//:googleapis_system_includes",
         "@com_google_googleapis//google/api:client_cc_proto",
         "@com_google_googleapis//google/api:field_info_cc_proto",
         "@com_google_googleapis//google/api:routing_cc_proto",

generator/generator.cc

@@ -22,7 +22,7 @@
 #include "google/cloud/internal/filesystem.h"
 #include "google/cloud/status_or.h"
 #include "absl/strings/str_split.h"
-#include <google/api/client.pb.h>
+#include "google/api/client.pb.h"
 #include <future>
 #include <string>
 #include <vector>

generator/generator_test.cc

@@ -17,9 +17,9 @@
 #include "generator/testing/error_collectors.h"
 #include "generator/testing/fake_source_tree.h"
 #include "generator/testing/printer_mocks.h"
+#include "google/protobuf/descriptor.pb.h"
 #include <google/protobuf/compiler/importer.h>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <gmock/gmock.h>
 

generator/integration_tests/benchmarks/client_benchmark.cc

@@ -19,14 +19,14 @@
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
+#include "google/cloud/location/locations.grpc.pb.h"
 #include "google/cloud/common_options.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/log.h"
 #include "google/cloud/version.h"
-#include <google/cloud/location/locations.grpc.pb.h>
-#include <google/iam/v1/iam_policy.grpc.pb.h>
-#include <google/longrunning/operations.grpc.pb.h>
+#include "google/iam/v1/iam_policy.grpc.pb.h"
+#include "google/longrunning/operations.grpc.pb.h"
 #include <benchmark/benchmark.h>
 #include <memory>
 

generator/integration_tests/golden/v1/deprecated_connection.h

@@ -26,7 +26,7 @@
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
-#include <generator/integration_tests/test_deprecated.pb.h>
+#include "generator/integration_tests/test_deprecated.pb.h"
 #include <memory>
 
 namespace google {

generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h

@@ -21,7 +21,7 @@
 
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
-#include <generator/integration_tests/test_deprecated.grpc.pb.h>
+#include "generator/integration_tests/test_deprecated.grpc.pb.h"
 #include <memory>
 
 namespace google {