diff options
author | 2021-07-29 13:34:22 -0700 | |
---|---|---|
committer | 2021-07-29 13:34:51 -0700 | |
commit | 54d2e21fa84d7f85bbabc89f06d19e2f5b4b30f6 (patch) | |
tree | 8b8c72d72d9d60975d4dad1ec282f2ea98b5cb06 | |
parent | f42f01b49d3e3d28ef2b0ae8f90cacd6f2b36ce2 (diff) |
go.mod: Add indirect exclusions/redirections from golang-protobuf upgrade
The golang-protobuf upgrade brought in new dependencies, which broke the
hermeticity of our go.mod redirections. Fix those up so they get
excluded or redirected to the locations in the tree.
Test: cd build/soong/cc; go test .
Change-Id: I012d11fad3b5509b213093e3c5889a27e641b868
-rw-r--r-- | go.mod | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -8,4 +8,12 @@ replace google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf replace github.com/google/blueprint v0.0.0 => ../blueprint +// Indirect deps from golang-protobuf +exclude github.com/golang/protobuf v1.5.0 + +replace github.com/google/go-cmp v0.5.5 => ../../external/go-cmp + +// Indirect dep from go-cmp +exclude golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 + go 1.15 |