From 54d2e21fa84d7f85bbabc89f06d19e2f5b4b30f6 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 29 Jul 2021 13:34:22 -0700 Subject: [PATCH] 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 --- go.mod | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/go.mod b/go.mod index 9a2ebcc63..14444b3cb 100644 --- a/go.mod +++ b/go.mod @@ -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