From 1f670397ce7f8a12dfb1fb32d8857b2233022856 Mon Sep 17 00:00:00 2001 From: capstan Date: Wed, 21 Oct 2020 01:54:49 +0200 Subject: [PATCH] Remove gflags. With the move to abseil's flags, this removed the now-unnecessary submodule and installation commands. --- .gitmodules | 3 - .travis.yml | 1 - BUILDING.md | 8 - CMakeLists.txt | 179 ------------------ bazel/grpc_deps.bzl | 11 -- build_handwritten.yaml | 4 - cmake/gflags.cmake | 34 ---- doc/command_line_tool.md | 11 -- templates/CMakeLists.txt.template | 7 - .../test/cxx_alpine_x64/Dockerfile.template | 5 - ...n_distrib_test_cmake_as_externalproject.sh | 1 - third_party/gflags | 1 - .../extract_metadata_from_bazel_xml.py | 2 +- tools/dockerfile/grpc_dist_proto/Dockerfile | 2 +- tools/dockerfile/grpc_scan_build/Dockerfile | 1 - .../dockerfile/test/cxx_alpine_x64/Dockerfile | 5 - .../linux_kokoro_performance_worker_init.sh | 2 +- .../run_tests/sanity/check_bazel_workspace.py | 1 - tools/run_tests/sanity/check_submodules.sh | 1 - 19 files changed, 3 insertions(+), 276 deletions(-) delete mode 100644 cmake/gflags.cmake delete mode 160000 third_party/gflags diff --git a/.gitmodules b/.gitmodules index 781cfac313d..ef9756814fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,9 +8,6 @@ [submodule "third_party/protobuf"] path = third_party/protobuf url = https://github.com/google/protobuf.git -[submodule "third_party/gflags"] - path = third_party/gflags - url = https://github.com/gflags/gflags.git [submodule "third_party/googletest"] path = third_party/googletest url = https://github.com/google/googletest.git diff --git a/.travis.yml b/.travis.yml index 94bf382b25e..5c432b93533 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,6 @@ before_install: - pod --version # Recent pods aren't found if we don't explicitly update Cocoapods' repo. - pod repo update - - brew install gflags install: - pushd $TEST_PATH - pod install diff --git a/BUILDING.md b/BUILDING.md index e9f0823c4da..531e3dc3401 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -19,8 +19,6 @@ If you plan to build using CMake If you are a contributor and plan to build and run tests, install the following as well: ```sh - $ # libgflags-dev is only required if building with make (deprecated) - $ [sudo] apt-get install libgflags-dev $ # clang and LLVM C++ lib is only required for sanitizer builds $ [sudo] apt-get install clang-5.0 libc++-dev ``` @@ -45,12 +43,6 @@ packages from [Homebrew](https://brew.sh): If you plan to build using CMake, follow the instructions from https://cmake.org/download/ -If you are a contributor and plan to build and run tests, install the following as well: -```sh - $ # gflags is only required if building with make (deprecated) - $ brew install gflags -``` - *Tip*: when building, you *may* want to explicitly set the `LIBTOOL` and `LIBTOOLIZE` environment variables when running `make` to ensure the version diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ddc53ec328..a0842ef9faf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,13 +88,9 @@ set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") if(gRPC_BUILD_TESTS) - set(gRPC_GFLAGS_PROVIDER "module" CACHE STRING "Provider of gflags library") - set_property(CACHE gRPC_GFLAGS_PROVIDER PROPERTY STRINGS "module" "package") - set(gRPC_BENCHMARK_PROVIDER "module" CACHE STRING "Provider of benchmark library") set_property(CACHE gRPC_BENCHMARK_PROVIDER PROPERTY STRINGS "module" "package") else() - set(gRPC_GFLAGS_PROVIDER "none") set(gRPC_BENCHMARK_PROVIDER "none") endif() @@ -252,7 +248,6 @@ include(cmake/abseil-cpp.cmake) include(cmake/address_sorting.cmake) include(cmake/benchmark.cmake) include(cmake/cares.cmake) -include(cmake/gflags.cmake) include(cmake/protobuf.cmake) include(cmake/re2.cmake) include(cmake/ssl.cmake) @@ -2663,7 +2658,6 @@ target_link_libraries(benchmark_helpers address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) endif() @@ -3220,7 +3214,6 @@ target_link_libraries(grpc++_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) foreach(_hdr @@ -3283,7 +3276,6 @@ target_link_libraries(grpc++_test_config ${_gRPC_ALLTARGETS_LIBRARIES} gpr absl::flags_parse - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -3345,7 +3337,6 @@ target_link_libraries(grpc++_test_util address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8171,7 +8162,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8217,7 +8207,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8259,7 +8248,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8311,7 +8299,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8354,7 +8341,6 @@ target_link_libraries(alts_util_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8415,7 +8401,6 @@ target_link_libraries(async_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8456,7 +8441,6 @@ target_link_libraries(auth_property_iterator_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8495,7 +8479,6 @@ target_link_libraries(authorization_engine_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8534,7 +8517,6 @@ target_link_libraries(aws_request_signer_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8573,7 +8555,6 @@ target_link_libraries(backoff_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8614,7 +8595,6 @@ target_link_libraries(bad_streaming_id_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8655,7 +8635,6 @@ target_link_libraries(badreq_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8695,7 +8674,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8740,7 +8718,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8785,7 +8762,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8830,7 +8806,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8875,7 +8850,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8924,7 +8898,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -8973,7 +8946,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9018,7 +8990,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9063,7 +9034,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9108,7 +9078,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9153,7 +9122,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9198,7 +9166,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9243,7 +9210,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9288,7 +9254,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9333,7 +9298,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9378,7 +9342,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9424,7 +9387,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) upb ${_gRPC_BENCHMARK_LIBRARIES} absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9469,7 +9431,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9514,7 +9475,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9559,7 +9519,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9604,7 +9563,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9649,7 +9607,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9691,7 +9648,6 @@ target_link_libraries(byte_buffer_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9730,7 +9686,6 @@ target_link_libraries(byte_stream_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9774,7 +9729,6 @@ target_link_libraries(cancel_ares_query_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9813,7 +9767,6 @@ target_link_libraries(certificate_provider_registry_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9852,7 +9805,6 @@ target_link_libraries(certificate_provider_store_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9906,7 +9858,6 @@ target_link_libraries(cfstream_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9946,7 +9897,6 @@ target_link_libraries(channel_arguments_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -9986,7 +9936,6 @@ target_link_libraries(channel_filter_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10031,7 +9980,6 @@ target_link_libraries(channel_trace_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10071,7 +10019,6 @@ target_link_libraries(channelz_registry_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10126,7 +10073,6 @@ target_link_libraries(channelz_service_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10171,7 +10117,6 @@ target_link_libraries(channelz_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10235,7 +10180,6 @@ target_link_libraries(cli_call_test address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10290,7 +10234,6 @@ target_link_libraries(client_callback_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10353,7 +10296,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10409,7 +10351,6 @@ target_link_libraries(client_interceptors_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10473,7 +10414,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10514,7 +10454,6 @@ target_link_libraries(codegen_test_full gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10554,7 +10493,6 @@ target_link_libraries(codegen_test_minimal gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10595,7 +10533,6 @@ target_link_libraries(connection_prefix_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10634,7 +10571,6 @@ target_link_libraries(connectivity_state_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10673,7 +10609,6 @@ target_link_libraries(context_list_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10727,7 +10662,6 @@ target_link_libraries(delegating_channel_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10768,7 +10702,6 @@ target_link_libraries(destroy_grpclb_channel_with_active_connect_stress_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10807,7 +10740,6 @@ target_link_libraries(dual_ref_counted_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10848,7 +10780,6 @@ target_link_libraries(duplicate_header_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10908,7 +10839,6 @@ target_link_libraries(end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10953,7 +10883,6 @@ target_link_libraries(error_details_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -10992,7 +10921,6 @@ target_link_libraries(evaluate_args_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11031,7 +10959,6 @@ target_link_libraries(eventmanager_libuv_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11073,7 +11000,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) upb absl::symbolize absl::stacktrace - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11127,7 +11053,6 @@ target_link_libraries(exception_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11166,7 +11091,6 @@ target_link_libraries(file_watcher_certificate_provider_factory_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11223,7 +11147,6 @@ target_link_libraries(filter_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11277,7 +11200,6 @@ target_link_libraries(flaky_network_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11334,7 +11256,6 @@ target_link_libraries(generic_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11374,7 +11295,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11414,7 +11334,6 @@ target_link_libraries(global_config_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11453,7 +11372,6 @@ target_link_libraries(google_mesh_ca_certificate_provider_factory_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11504,7 +11422,6 @@ target_link_libraries(grpc_cli address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11809,7 +11726,6 @@ target_link_libraries(grpc_tls_certificate_distributor_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11848,7 +11764,6 @@ target_link_libraries(grpc_tls_credentials_options_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11910,7 +11825,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -11956,7 +11870,6 @@ target_link_libraries(grpclb_api_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12019,7 +11932,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12060,7 +11972,6 @@ target_link_libraries(h2_ssl_session_reuse_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12101,7 +12012,6 @@ target_link_libraries(head_of_line_blocking_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12142,7 +12052,6 @@ target_link_libraries(headers_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12205,7 +12114,6 @@ target_link_libraries(health_service_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12260,7 +12168,6 @@ target_link_libraries(http2_client address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12318,7 +12225,6 @@ target_link_libraries(hybrid_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12357,7 +12263,6 @@ target_link_libraries(init_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12398,7 +12303,6 @@ target_link_libraries(initial_settings_frame_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12437,7 +12341,6 @@ target_link_libraries(insecure_security_connector_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12495,7 +12398,6 @@ target_link_libraries(interop_client address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12552,7 +12454,6 @@ target_link_libraries(interop_server address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12596,7 +12497,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12636,7 +12536,6 @@ target_link_libraries(json_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12677,7 +12576,6 @@ target_link_libraries(large_metadata_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12721,7 +12619,6 @@ target_link_libraries(lb_get_cpu_stats_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12762,7 +12659,6 @@ target_link_libraries(lb_load_data_store_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12801,7 +12697,6 @@ target_link_libraries(linux_system_roots_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12855,7 +12750,6 @@ target_link_libraries(message_allocator_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12913,7 +12807,6 @@ target_link_libraries(mock_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -12966,7 +12859,6 @@ target_link_libraries(nonblocking_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13006,7 +12898,6 @@ target_link_libraries(noop-benchmark address_sorting upb ${_gRPC_BENCHMARK_LIBRARIES} - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13045,7 +12936,6 @@ target_link_libraries(orphanable_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13086,7 +12976,6 @@ target_link_libraries(out_of_bounds_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13125,7 +13014,6 @@ target_link_libraries(pid_controller_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13179,7 +13067,6 @@ target_link_libraries(port_sharing_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13239,7 +13126,6 @@ target_link_libraries(proto_server_reflection_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13279,7 +13165,6 @@ target_link_libraries(proto_utils_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13368,7 +13253,6 @@ target_link_libraries(qps_json_driver address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13449,7 +13333,6 @@ target_link_libraries(qps_worker address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13507,7 +13390,6 @@ target_link_libraries(raw_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13546,7 +13428,6 @@ target_link_libraries(ref_counted_ptr_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13585,7 +13466,6 @@ target_link_libraries(ref_counted_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13625,7 +13505,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13665,7 +13544,6 @@ target_link_libraries(retry_throttle_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13706,7 +13584,6 @@ target_link_libraries(secure_auth_context_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13764,7 +13641,6 @@ target_link_libraries(server_builder_plugin_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13817,7 +13693,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13871,7 +13746,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13911,7 +13785,6 @@ target_link_libraries(server_chttp2_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -13953,7 +13826,6 @@ target_link_libraries(server_context_test_spouse_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14006,7 +13878,6 @@ target_link_libraries(server_early_return_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14061,7 +13932,6 @@ target_link_libraries(server_interceptors_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14102,7 +13972,6 @@ target_link_libraries(server_registered_method_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14155,7 +14024,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14214,7 +14082,6 @@ target_link_libraries(service_config_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14253,7 +14120,6 @@ target_link_libraries(service_config_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14292,7 +14158,6 @@ target_link_libraries(settings_timeout_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14349,7 +14214,6 @@ target_link_libraries(shutdown_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14390,7 +14254,6 @@ target_link_libraries(simple_request_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14431,7 +14294,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) address_sorting upb absl::symbolize - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14471,7 +14333,6 @@ target_link_libraries(stat_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14510,7 +14371,6 @@ target_link_libraries(static_metadata_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14549,7 +14409,6 @@ target_link_libraries(stats_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14588,7 +14447,6 @@ target_link_libraries(status_metadata_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14627,7 +14485,6 @@ target_link_libraries(status_util_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14668,7 +14525,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14727,7 +14583,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14768,7 +14623,6 @@ target_link_libraries(string_ref_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14808,7 +14662,6 @@ target_link_libraries(test_cpp_client_credentials_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14848,7 +14701,6 @@ target_link_libraries(test_cpp_server_credentials_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14889,7 +14741,6 @@ target_link_libraries(test_cpp_util_slice_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14930,7 +14781,6 @@ target_link_libraries(test_cpp_util_time_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -14972,7 +14822,6 @@ target_link_libraries(thread_manager_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15030,7 +14879,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15072,7 +14920,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15113,7 +14960,6 @@ target_link_libraries(timer_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15152,7 +14998,6 @@ target_link_libraries(tls_security_connector_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15195,7 +15040,6 @@ target_link_libraries(too_many_pings_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15236,7 +15080,6 @@ target_link_libraries(unknown_frame_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15277,7 +15120,6 @@ target_link_libraries(window_overflow_bad_client_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15317,7 +15159,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15396,7 +15237,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) absl::symbolize absl::stacktrace absl::failure_signal_handler - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15436,7 +15276,6 @@ target_link_libraries(xds_bootstrap_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15475,7 +15314,6 @@ target_link_libraries(xds_certificate_provider_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15529,7 +15367,6 @@ target_link_libraries(xds_credentials_end2end_test gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15672,7 +15509,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) gpr address_sorting upb - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15727,7 +15563,6 @@ target_link_libraries(xds_interop_client address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15781,7 +15616,6 @@ target_link_libraries(xds_interop_server address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15823,7 +15657,6 @@ target_link_libraries(alts_credentials_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15865,7 +15698,6 @@ target_link_libraries(client_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15907,7 +15739,6 @@ target_link_libraries(hpack_parser_fuzzer_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15949,7 +15780,6 @@ target_link_libraries(http_request_fuzzer_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -15991,7 +15821,6 @@ target_link_libraries(http_response_fuzzer_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16033,7 +15862,6 @@ target_link_libraries(json_fuzzer_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16075,7 +15903,6 @@ target_link_libraries(nanopb_fuzzer_response_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16117,7 +15944,6 @@ target_link_libraries(nanopb_fuzzer_serverlist_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16159,7 +15985,6 @@ target_link_libraries(percent_decode_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16201,7 +16026,6 @@ target_link_libraries(percent_encode_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16243,7 +16067,6 @@ target_link_libraries(server_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16285,7 +16108,6 @@ target_link_libraries(ssl_server_fuzzer_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) @@ -16327,7 +16149,6 @@ target_link_libraries(uri_fuzzer_test_one_entry address_sorting upb absl::flags - ${_gRPC_GFLAGS_LIBRARIES} ) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index db6256e467d..0ef41027b27 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -196,17 +196,6 @@ def grpc_deps(): ], ) - if "com_github_gflags_gflags" not in native.existing_rules(): - http_archive( - name = "com_github_gflags_gflags", - sha256 = "63ae70ea3e05780f7547d03503a53de3a7d2d83ad1caaa443a31cb20aea28654", - strip_prefix = "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e", - urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", - "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", - ], - ) - if "com_github_google_benchmark" not in native.existing_rules(): http_archive( name = "com_github_google_benchmark", diff --git a/build_handwritten.yaml b/build_handwritten.yaml index a229ea5b01b..886e48474c7 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -58,10 +58,6 @@ vspackages: props: true redist: true version: 1.0.204.1 -- name: gflags - props: false - redist: false - version: 2.1.2.1 - name: gtest props: false redist: false diff --git a/cmake/gflags.cmake b/cmake/gflags.cmake deleted file mode 100644 index f00c4666d2d..00000000000 --- a/cmake/gflags.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2017 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if(gRPC_GFLAGS_PROVIDER STREQUAL "module") - if(NOT GFLAGS_ROOT_DIR) - set(GFLAGS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gflags) - endif() - if(EXISTS "${GFLAGS_ROOT_DIR}/CMakeLists.txt") - add_subdirectory(${GFLAGS_ROOT_DIR} third_party/gflags) - set(_gRPC_GFLAGS_LIBRARIES gflags::gflags) - else() - message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong") - endif() -elseif(gRPC_GFLAGS_PROVIDER STREQUAL "package") - # Use "CONFIG" as there is no built-in cmake module for gflags. - find_package(gflags REQUIRED CONFIG) - if(TARGET gflags::gflags) - set(_gRPC_GFLAGS_LIBRARIES gflags::gflags) - endif() - set(_gRPC_FIND_GFLAGS "if(NOT gflags_FOUND)\n find_package(gflags CONFIG)\nendif()") -elseif(gRPC_GFLAGS_PROVIDER STREQUAL "none") - # gflags is a test-only dependency and can be avoided if we're not building tests. -endif() diff --git a/doc/command_line_tool.md b/doc/command_line_tool.md index 786825fde32..be95a6d4f72 100644 --- a/doc/command_line_tool.md +++ b/doc/command_line_tool.md @@ -41,17 +41,6 @@ repository, you need to run the following command to update submodules: git submodule update --init ``` -You also need to have the gflags library installed on your system. gflags can be -installed with the following command: -Linux: -``` -sudo apt-get install libgflags-dev -``` -Mac systems with Homebrew: -``` -brew install gflags -``` - Once the prerequisites are satisfied, you can build with cmake: ``` diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 760c348ba4c..022f52baefe 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -71,8 +71,6 @@ deps.append(get_absl_dep(d)) else: deps.append(d) - if (target_dict.build == 'test' or target_dict.build == 'private') and target_dict.language == 'c++': - deps.append("${_gRPC_GFLAGS_LIBRARIES}") return deps def get_platforms_condition_begin(platforms): @@ -199,13 +197,9 @@ set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") if(gRPC_BUILD_TESTS) - set(gRPC_GFLAGS_PROVIDER "module" CACHE STRING "Provider of gflags library") - set_property(CACHE gRPC_GFLAGS_PROVIDER PROPERTY STRINGS "module" "package") - set(gRPC_BENCHMARK_PROVIDER "module" CACHE STRING "Provider of benchmark library") set_property(CACHE gRPC_BENCHMARK_PROVIDER PROPERTY STRINGS "module" "package") else() - set(gRPC_GFLAGS_PROVIDER "none") set(gRPC_BENCHMARK_PROVIDER "none") endif() @@ -315,7 +309,6 @@ include(cmake/address_sorting.cmake) include(cmake/benchmark.cmake) include(cmake/cares.cmake) - include(cmake/gflags.cmake) include(cmake/protobuf.cmake) include(cmake/re2.cmake) include(cmake/ssl.cmake) diff --git a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template index bd05005fb42..ffa416960fe 100644 --- a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template @@ -47,11 +47,6 @@ # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client - # Install gflags - RUN git clone https://github.com/gflags/gflags.git && cd gflags && git checkout v2.2.0 - RUN cd gflags && cmake . && make && make install - RUN ln -s /usr/local/include/gflags /usr/include/gflags - <%include file="../../run_tests_addons.include"/> # Define the default command. diff --git a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh index 7ef1d2ee51a..1729f2d84dd 100755 --- a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh +++ b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh @@ -26,7 +26,6 @@ apt-get update && apt-get install -y libssl-dev rm -r third_party/benchmark/* || true rm -r third_party/bloaty/* || true rm -r third_party/boringssl-with-bazel/* || true -rm -r third_party/gflags/* || true rm -r third_party/googletest/* || true # Build helloworld example using cmake superbuild diff --git a/third_party/gflags b/third_party/gflags deleted file mode 160000 index 28f50e0fed1..00000000000 --- a/third_party/gflags +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 28f50e0fed19872e0fd50dd23ce2ee8cd759338e diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py index 2bf63cdc5d1..63f8e2e5d6b 100755 --- a/tools/buildgen/extract_metadata_from_bazel_xml.py +++ b/tools/buildgen/extract_metadata_from_bazel_xml.py @@ -239,7 +239,7 @@ def _external_dep_name_from_bazel_dependency(bazel_dep): elif bazel_dep == '//external:benchmark': return 'benchmark' else: - # all the other external deps such as gflags, protobuf, cares, zlib + # all the other external deps such as protobuf, cares, zlib # don't need to be listed explicitly, they are handled automatically # by the build system (make, cmake) return None diff --git a/tools/dockerfile/grpc_dist_proto/Dockerfile b/tools/dockerfile/grpc_dist_proto/Dockerfile index e771df4b68b..71d76fca064 100644 --- a/tools/dockerfile/grpc_dist_proto/Dockerfile +++ b/tools/dockerfile/grpc_dist_proto/Dockerfile @@ -19,7 +19,7 @@ FROM grpc/base ADD version.txt version.txt # Install tools needed for building protoc. -RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev +RUN apt-get update && apt-get -y install libgtest-dev # Get the protobuf source from GitHub. RUN mkdir -p /var/local/git diff --git a/tools/dockerfile/grpc_scan_build/Dockerfile b/tools/dockerfile/grpc_scan_build/Dockerfile index 265bafaf8e8..cc11221cd08 100644 --- a/tools/dockerfile/grpc_scan_build/Dockerfile +++ b/tools/dockerfile/grpc_scan_build/Dockerfile @@ -17,7 +17,6 @@ FROM grpc/clang:latest RUN apt-get update && apt-get install -y \ autoconf \ libtool \ - libgflags-dev \ libgtest-dev \ && apt-get clean diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile index fbab3d3e09f..cfff38eec5c 100644 --- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile @@ -45,11 +45,6 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.15.0 t # Google Cloud platform API libraries RUN pip install --upgrade google-api-python-client -# Install gflags -RUN git clone https://github.com/gflags/gflags.git && cd gflags && git checkout v2.2.0 -RUN cd gflags && cmake . && make && make install -RUN ln -s /usr/local/include/gflags /usr/include/gflags - RUN mkdir /var/local/jenkins diff --git a/tools/gce/linux_kokoro_performance_worker_init.sh b/tools/gce/linux_kokoro_performance_worker_init.sh index f89e81b360c..a325611ceae 100755 --- a/tools/gce/linux_kokoro_performance_worker_init.sh +++ b/tools/gce/linux_kokoro_performance_worker_init.sh @@ -74,7 +74,7 @@ sudo apt-get install -y python-psutil python3-psutil sudo apt-get install -y google-cloud-sdk # C++ dependencies -sudo apt-get install -y libgflags-dev libgtest-dev libc++-dev clang +sudo apt-get install -y libgtest-dev libc++-dev clang # Python dependencies sudo pip install --upgrade pip==19.3.1 diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index b784a15eec9..b73f1f2555e 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -49,7 +49,6 @@ _GRPC_DEP_NAMES = [ 'com_google_protobuf', 'com_google_googletest', 'rules_cc', - 'com_github_gflags_gflags', 'com_github_google_benchmark', 'com_github_cares_cares', 'com_google_absl', diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index cc603a4e606..0c63d09083a 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -32,7 +32,6 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 29c6e0e27268f5a43e039cd2ed4e849d6b736fc1 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel) e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0) 9997e1137cdb59e622af13e57ca915a2f3c9f84f third_party/envoy-api (heads/master) - 28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81) 80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb) c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/googletest (6e2f397) 15ae750151ac9341e5945eb38f8982d59fb99201 third_party/libuv (v1.34.0)