Skip to content

Commit ce127d7

Browse files
committed
add external_include_paths to bazelrc
1 parent be89e8d commit ce127d7

54 files changed

Lines changed: 167 additions & 156 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
# Use host-OS-specific config lines from bazelrc files.
1919
build --enable_platform_specific_config=true
2020

21+
build --features=external_include_paths
22+
23+
build --per_file_copt=grpc+//@-Wno-private-header
24+
build --copt=-Wno-private-header
25+
build --cxxopt=-Wno-private-header
26+
build --host_copt=-Wno-private-header
27+
build --host_cxxopt=-Wno-private-header
28+
2129
# The project requires C++ >= 17.
2230
build:linux --cxxopt=-std=c++17
2331
build:macos --cxxopt=-std=c++17
@@ -72,6 +80,8 @@ build:sanitizer --strip=never
7280
build:sanitizer --copt=-Og
7381
build:sanitizer --copt=-g
7482
build:sanitizer --copt=-fno-omit-frame-pointer
83+
build:sanitizer --features=external_include_paths
84+
7585

7686
# --config asan: Address Sanitizer
7787
build:asan --config=sanitizer
@@ -104,6 +114,8 @@ build:ubsan --copt=-DCURL_STRICTER
104114
build:ubsan --linkopt=-fsanitize=undefined
105115
build:ubsan --linkopt=-fsanitize-link-c++-runtime
106116
build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
117+
build:ubsan --features=external_include_paths
118+
107119

108120
# --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
109121
build:xsan --config=sanitizer

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ python.toolchain(
5151
python_version = "3.11",
5252
)
5353

54-
bazel_dep(name = "grpc", version = "1.73.0-pre1", repo_name = "com_github_grpc_grpc")
54+
bazel_dep(name = "grpc", version = "1.72.0", repo_name = "com_github_grpc_grpc")
5555
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
5656
archive_override(
5757
module_name = "googleapis",

generator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cc_library(
3737
"@abseil-cpp//absl/strings:str_format",
3838
"@com_github_jbeder_yaml_cpp//:yaml-cpp",
3939
"@com_github_nlohmann_json//:json",
40-
# "@com_google_googleapis//:googleapis_system_includes",
40+
# "@com_google_googleapis//:googleapis_system_includes",
4141
"@com_google_googleapis//google/api:client_cc_proto",
4242
"@com_google_googleapis//google/api:field_info_cc_proto",
4343
"@com_google_googleapis//google/api:routing_cc_proto",

generator/generator_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "generator/testing/error_collectors.h"
1818
#include "generator/testing/fake_source_tree.h"
1919
#include "generator/testing/printer_mocks.h"
20+
#include "google/protobuf/descriptor.pb.h"
2021
#include <google/protobuf/compiler/importer.h>
2122
#include <google/protobuf/descriptor.h>
22-
#include "google/protobuf/descriptor.pb.h"
2323
#include <google/protobuf/io/zero_copy_stream.h>
2424
#include <gmock/gmock.h>
2525

generator/integration_tests/benchmarks/client_benchmark.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h"
2020
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h"
2121
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
22+
#include "google/cloud/location/locations.grpc.pb.h"
2223
#include "google/cloud/common_options.h"
2324
#include "google/cloud/grpc_options.h"
2425
#include "google/cloud/internal/make_status.h"
2526
#include "google/cloud/log.h"
2627
#include "google/cloud/version.h"
27-
#include "google/cloud/location/locations.grpc.pb.h"
2828
#include "google/iam/v1/iam_policy.grpc.pb.h"
2929
#include "google/longrunning/operations.grpc.pb.h"
3030
#include <benchmark/benchmark.h>

generator/integration_tests/tests/golden_kitchen_sink_rest_stub_factory_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
// limitations under the License.
1414

1515
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h"
16+
#include "generator/integration_tests/test.pb.h"
1617
#include "google/cloud/common_options.h"
1718
#include "google/cloud/testing_util/scoped_log.h"
1819
#include "google/cloud/testing_util/status_matchers.h"
19-
#include "generator/integration_tests/test.pb.h"
2020
#include <gmock/gmock.h>
2121
#include <memory>
2222

generator/internal/descriptor_utils_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "google/cloud/internal/absl_str_cat_quiet.h"
2121
#include "google/cloud/testing_util/status_matchers.h"
2222
#include "absl/strings/str_split.h"
23-
#include <google/protobuf/compiler/importer.h>
2423
#include "google/protobuf/descriptor.pb.h"
24+
#include <google/protobuf/compiler/importer.h>
2525
#include <google/protobuf/descriptor_database.h>
2626
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
2727
#include <google/protobuf/text_format.h>

generator/internal/longrunning.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include "generator/internal/codegen_utils.h"
1717
#include "generator/internal/doxygen.h"
1818
#include "generator/internal/http_option_utils.h"
19+
#include "google/cloud/extended_operations.pb.h"
1920
#include "google/cloud/internal/absl_str_cat_quiet.h"
2021
#include "google/cloud/log.h"
2122
#include "absl/types/variant.h"
22-
#include "google/cloud/extended_operations.pb.h"
2323
#include "google/longrunning/operations.pb.h"
2424
#include <string>
2525

generator/internal/make_generators_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "generator/testing/error_collectors.h"
1818
#include "generator/testing/fake_source_tree.h"
1919
#include "generator/testing/printer_mocks.h"
20+
#include "google/protobuf/descriptor.pb.h"
2021
#include <google/protobuf/compiler/importer.h>
2122
#include <google/protobuf/descriptor.h>
22-
#include "google/protobuf/descriptor.pb.h"
2323
#include <gmock/gmock.h>
2424

2525
namespace google {

generator/internal/pagination_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "generator/testing/error_collectors.h"
1818
#include "generator/testing/fake_source_tree.h"
1919
#include "google/cloud/internal/absl_str_replace_quiet.h"
20-
#include <google/protobuf/descriptor.h>
2120
#include "google/protobuf/descriptor.pb.h"
21+
#include <google/protobuf/descriptor.h>
2222
#include <google/protobuf/text_format.h>
2323
#include <gmock/gmock.h>
2424

0 commit comments

Comments
 (0)