aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2021-07-29 20:48:28 -0700
committerDan Willemsen <dwillemsen@google.com>2021-07-29 20:48:46 -0700
commitaf562fc7f053bd42fb989e4548f91390f7eaceee (patch)
tree8a488d404b24329b07a56497bed5db7183ca762b
parent63aebf250bc079f991a6b00b995287bb6649c78e (diff)
downloadplatform_test_app_compat_csuite-af562fc7f053bd42fb989e4548f91390f7eaceee.tar.gz
platform_test_app_compat_csuite-af562fc7f053bd42fb989e4548f91390f7eaceee.tar.bz2
platform_test_app_compat_csuite-af562fc7f053bd42fb989e4548f91390f7eaceee.zip
Fix go.mod with golang-protobuf upgrade
Test: go test . Change-Id: I85223425b499f9696d447f86dce2cc13cf627724
-rw-r--r--tools/csuite_test/go.mod16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/csuite_test/go.mod b/tools/csuite_test/go.mod
index a373cd1..2ab342d 100644
--- a/tools/csuite_test/go.mod
+++ b/tools/csuite_test/go.mod
@@ -1,14 +1,22 @@
module android/soong/csuite
require (
- android/soong v0.0.0
- github.com/google/blueprint v0.0.0
+ android/soong v0.0.0
+ github.com/google/blueprint v0.0.0
)
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
-go 1.13 \ No newline at end of file
+// 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