diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-31 19:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-31 19:46:41 +0000 |
| commit | eef1266e2fa80324ed04ba73e32f02f12a0fc353 (patch) | |
| tree | a1ed2ee64579ba5beda923232f87bc87f89ae088 | |
| parent | cedfd1ad6e476d5384fe15300b496e662fee12dc (diff) | |
| parent | af562fc7f053bd42fb989e4548f91390f7eaceee (diff) | |
| download | platform_test_app_compat_csuite-eef1266e2fa80324ed04ba73e32f02f12a0fc353.tar.gz platform_test_app_compat_csuite-eef1266e2fa80324ed04ba73e32f02f12a0fc353.tar.bz2 platform_test_app_compat_csuite-eef1266e2fa80324ed04ba73e32f02f12a0fc353.zip | |
Merge "Fix go.mod with golang-protobuf upgrade"HEADandroid-s-beta-5masterandroid-s-beta-5
| -rw-r--r-- | tools/csuite_test/go.mod | 16 |
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 |