Backport bazel changes from #13468 to 1.8.x#13829
Merged
apolcyn merged 4 commits intogrpc:v1.8.xfrom Dec 22, 2017
Merged
Conversation
…sued by other projects, and simplifies cares build.
…s dependency check. Otherwise include "third_party/nanopb/pb.h" will find local ph.h rather than the one in "//external:nanopb".
… they are only present on master
apolcyn
requested review from
ctiller,
dgquintas and
nicolasnoble
as code owners
|
|
|
mehrdada
approved these changes
Dec 21, 2017
Contributor
Author
|
Not merging right now, I think the fix for #13862 needs to be backported as well |
Contributor
Author
|
will merge now that #13863 has been merged |
Contributor
Author
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This can allow consuming grpc with bazel on 1.8.x with the new simpler setup that was initially proposed in #13468
There were a couple of manual merge conflicts unnoticed by git that are addressed in the most recent commit here (needed to remove references to a couple of things that only exist in master branch, like bazel toolchains).