From 8de64087a3da2303eaec05e877ebb8bff6042dfc Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 14 Jun 2019 00:20:29 +0200 Subject: [PATCH] Clean bazel 0.26 upgrade. --- BUILD | 156 ++------------------- WORKSPACE | 2 +- bazel/grpc_build_system.bzl | 5 + bazel/grpc_deps.bzl | 16 +-- third_party/data-plane-api | 2 +- third_party/upb | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 7 files changed, 28 insertions(+), 157 deletions(-) diff --git a/BUILD b/BUILD index 214c5ddf078..f61bbe39770 100644 --- a/BUILD +++ b/BUILD @@ -31,10 +31,9 @@ load( "grpc_cc_library", "grpc_generate_one_off_targets", "grpc_proto_plugin", + "grpc_upb_proto_library", ) -load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") - config_setting( name = "grpc_no_ares", values = {"define": "grpc_no_ares=true"}, @@ -2365,35 +2364,29 @@ grpc_cc_library( ], ) -upb_proto_library( +grpc_upb_proto_library( name = "upb_load_report", - deps = ["@data_plane_api//envoy/api/v2/endpoint:load_report_export"] + deps = ["@envoy_api//envoy/api/v2/endpoint:load_report_export"] ) -upb_proto_library( +grpc_upb_proto_library( name = "upb_lrs", - deps = ["@data_plane_api//envoy/service/load_stats/v2:lrs_export"] + deps = ["@envoy_api//envoy/service/load_stats/v2:lrs_export"] +) + +grpc_upb_proto_library( + name = "upb_cds", + deps = ["@envoy_api//envoy/api/v2:cds_export"] ) #TODO: Get this into build.yaml once we start using it. grpc_cc_library( name = "envoy_lrs_upb", -# srcs = [ -# "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c", -# "src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c", -# ], -# hdrs = [ -# "src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h", -# "src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h", -# ], language = "c++", external_deps = [ "upb_lib", ], deps = [ - ":envoy_core_upb", - ":google_api_upb", - ":proto_gen_validate_upb", ":upb_load_report", ":upb_lrs" ], @@ -2402,140 +2395,13 @@ grpc_cc_library( grpc_cc_library( name = "envoy_ads_upb", - srcs = [ - "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/cds.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/eds.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c", - "src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/cds.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/eds.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h", - "src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.h", - ], external_deps = [ "upb_lib", ], language = "c++", deps = [ - ":envoy_core_upb", - ":envoy_type_upb", - ":google_api_upb", - ":proto_gen_validate_upb", - ], - tags = ["no_windows"], -) - -grpc_cc_library( - name = "envoy_core_upb", - srcs = [ - "src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c", - "src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/envoy/api/v2/core/address.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h", - "src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h", + ":upb_cds", ], - external_deps = [ - "upb_lib", - ], - language = "c++", - tags = ["no_windows"], - deps = [ - ":envoy_type_upb", - ":google_api_upb", - ":proto_gen_validate_upb", - ], -) - -grpc_cc_library( - name = "envoy_type_upb", - srcs = [ - "src/core/ext/upb-generated/envoy/type/percent.upb.c", - "src/core/ext/upb-generated/envoy/type/range.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/envoy/type/percent.upb.h", - "src/core/ext/upb-generated/envoy/type/range.upb.h", - ], - external_deps = [ - "upb_lib", - ], - language = "c++", - tags = ["no_windows"], - deps = [ - ":google_api_upb", - ":proto_gen_validate_upb", - ], -) - -grpc_cc_library( - name = "proto_gen_validate_upb", - srcs = [ - "src/core/ext/upb-generated/gogoproto/gogo.upb.c", - "src/core/ext/upb-generated/validate/validate.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/gogoproto/gogo.upb.h", - "src/core/ext/upb-generated/validate/validate.upb.h", - ], - external_deps = [ - "upb_lib", - ], - language = "c++", - tags = ["no_windows"], - deps = [ - ":google_api_upb", - ], -) - -grpc_cc_library( - name = "google_api_upb", - srcs = [ - "src/core/ext/upb-generated/google/api/annotations.upb.c", - "src/core/ext/upb-generated/google/api/http.upb.c", - "src/core/ext/upb-generated/google/protobuf/any.upb.c", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", - "src/core/ext/upb-generated/google/protobuf/duration.upb.c", - "src/core/ext/upb-generated/google/protobuf/empty.upb.c", - "src/core/ext/upb-generated/google/protobuf/struct.upb.c", - "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c", - "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c", - "src/core/ext/upb-generated/google/rpc/status.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/google/api/annotations.upb.h", - "src/core/ext/upb-generated/google/api/http.upb.h", - "src/core/ext/upb-generated/google/protobuf/any.upb.h", - "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", - "src/core/ext/upb-generated/google/protobuf/duration.upb.h", - "src/core/ext/upb-generated/google/protobuf/empty.upb.h", - "src/core/ext/upb-generated/google/protobuf/struct.upb.h", - "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h", - "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h", - "src/core/ext/upb-generated/google/rpc/status.upb.h", - ], - external_deps = [ - "upb_lib", - ], - language = "c++", tags = ["no_windows"], ) diff --git a/WORKSPACE b/WORKSPACE index 755760efefc..11b30e2a68d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -70,7 +70,7 @@ rbe_autoconfig( load("@upb//bazel:workspace_deps.bzl", "upb_deps") upb_deps() -load("@data_plane_api//bazel:repositories.bzl", "api_dependencies") +load("@envoy_api//bazel:repositories.bzl", "api_dependencies") api_dependencies() load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains") diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 5f8477d7325..ee6dd2ce3d1 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -24,6 +24,7 @@ # load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") # The set of pollers to test against if a test exercises polling POLLERS = ["epollex", "epoll1", "poll"] @@ -248,3 +249,7 @@ def grpc_package(name, visibility = "private", features = []): default_visibility = visibility, features = features, ) + +def grpc_upb_proto_library(name, deps): + upb_proto_library(name = name, deps = deps) + diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index da96b8118b2..cb9fe3ed440 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -212,16 +212,16 @@ def grpc_deps(): if "upb" not in native.existing_rules(): http_archive( name = "upb", - sha256 = "3aa0c5aff130d97618fe137e3e76603b2381e3698cd7ca7a4a54327f7c44c69c", - strip_prefix = "upb-ef6ce94bfecf36fb57acd8a8b470c0560959f063", - url = "https://github.com/google/upb/archive/ef6ce94bfecf36fb57acd8a8b470c0560959f063.tar.gz", + sha256 = "909b6fca860a85bea7dda4770aae66f6afd6f12586e8a4cb95460d0707fd66ce", + strip_prefix = "upb-312c6b421a3c749e4f7c0e2193d4775cb997cff7", + url = "https://github.com/haberman/upb/archive/312c6b421a3c749e4f7c0e2193d4775cb997cff7.tar.gz", ) - if "data_plane_api" not in native.existing_rules(): + if "envoy_api" not in native.existing_rules(): http_archive( - name = "data_plane_api", - sha256 = "9b9e0e3882df11f1a174aac7d78c2238a8bfbadad271b673f351a86137613cde", - strip_prefix = "data-plane-api-911001cdca003337bdb93fab32740cde61bafee3", - url = "https://github.com/envoyproxy/data-plane-api/archive/911001cdca003337bdb93fab32740cde61bafee3.tar.gz", + name = "envoy_api", + sha256 = "a2c6e854fa9653b0ed6510e31ec7c51eac43d578b54cd75c0bc1898f7515c60d", + strip_prefix = "data-plane-api-a83394157ad97f4dadbc8ed81f56ad5b3a72e542", + url = "https://github.com/envoyproxy/data-plane-api/archive/a83394157ad97f4dadbc8ed81f56ad5b3a72e542.tar.gz", ) if "io_bazel_rules_go" not in native.existing_rules(): diff --git a/third_party/data-plane-api b/third_party/data-plane-api index 911001cdca0..ed9db8d1c82 160000 --- a/third_party/data-plane-api +++ b/third_party/data-plane-api @@ -1 +1 @@ -Subproject commit 911001cdca003337bdb93fab32740cde61bafee3 +Subproject commit ed9db8d1c8201ccdba2cb50a066f5956d6d91069 diff --git a/third_party/upb b/third_party/upb index ef6ce94bfec..312c6b421a3 160000 --- a/third_party/upb +++ b/third_party/upb @@ -1 +1 @@ -Subproject commit ef6ce94bfecf36fb57acd8a8b470c0560959f063 +Subproject commit 312c6b421a3c749e4f7c0e2193d4775cb997cff7 diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 9c49d635959..3238fcef7ad 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -40,7 +40,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60) 582743bf40c5d3639a70f98f183914a2c0cd0680 third_party/protobuf (v3.7.0-rc.2-20-g582743bf) e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10) - ef6ce94bfecf36fb57acd8a8b470c0560959f063 third_party/upb (heads/master) + 312c6b421a3c749e4f7c0e2193d4775cb997cff7 third_party/upb (heads/master) cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11) EOF