commit d35b9524ead8a07c3cb01395cb093c1e88080fa1
author Dan Willemsen <dwillemsen@google.com> Thu Jul 29 20:45:23 2021 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 30 16:48:02 2021 +0000
tree aa3d9a0f9a1f07461741b0bca996ebf48da2bc7f
parent fc2ddbfcf7c8eddb03b4820095a494f572d1dbbd

Fix go.mod with golang-protobuf upgrade

Test: go test .
Change-Id: I799402b956e2cf1a022baf0f447adae0305c8a46

build/go.mod

diff --git a/build/go.mod b/build/go.mod
index 3ef7a49..5e5f4b9 100644
--- a/build/go.mod
+++ b/build/go.mod
@@ -7,8 +7,16 @@
 
 replace android/soong v0.0.0 => ../../../../build/soong
 
-replace github.com/golang/protobuf v0.0.0 => ../../../../external/golang-protobuf
+replace google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf
 
 replace github.com/google/blueprint v0.0.0 => ../../../../build/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.13