diff options
| author |  Vishal Powar <vishalpowar@google.com> | 2018-11-30 14:27:52 -0800 |
|---|---|---|
| committer | Vishal Powar <vishalpowar@google.com> | 2018-12-11 14:59:02 -0800 |
| commit | 62027b7e14624283f758a7785a0a1347eda0a147 (patch) | |
| tree | 76db8a6a8a5d3a86353a268f5eb3305e1f4c0523 /bazel | |
| parent | 9bd5b3778abbb2564544a69d9c99d3c87a3354eb (diff) | |
Changes add a script for generating C code and build rule for protobuf
protos
All these changes need to go together to make sense
- changes to use new version of upb in bazel
- allowing includes in build target option
- script for generating c code for protos
- generated code for example build
- adding changes for non-bazel builds
- change sanity tests to ignore the generated files.
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/grpc_build_system.bzl | 1 | ||||
| -rw-r--r-- | bazel/grpc_deps.bzl | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 65fe5a10aa..06b05f7952 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -99,6 +99,7 @@ def grpc_cc_library( linkopts = if_not_windows(["-pthread"]), includes = [ "include", + "src/core/ext/upb-generated", ], alwayslink = alwayslink, data = data, diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 3eacd2b047..2738e39abf 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -12,7 +12,7 @@ def grpc_deps(): ) native.bind( - name = "upblib", + name = "upb_lib", actual = "@upb//:upb", ) @@ -195,8 +195,8 @@ def grpc_deps(): if "upb" not in native.existing_rules(): http_archive( name = "upb", - strip_prefix = "upb-9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3", - url = "https://github.com/google/upb/archive/9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3.tar.gz", + strip_prefix = "upb-fb6f7e96895c3a9a8ae2e66516160937e7ac1779", + url = "https://github.com/google/upb/archive/fb6f7e96895c3a9a8ae2e66516160937e7ac1779.tar.gz", ) |