From 8756ae3702b1d2e3fcb6a11d393f74f4ef835e70 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Fri, 2 Dec 2022 15:27:17 -0800 Subject: [PATCH] Fix go.mod, add go.work to use local versions of the dependent modules. Test: treehugger, (cd build/soong && go build ./...) Change-Id: I22fd664b5dcc9f4691c5182fdf0dfe53abc0c584 --- go.mod | 22 +++++----------------- go.work | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 go.work diff --git a/go.mod b/go.mod index 7239f6d13..a5d9dd51b 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,9 @@ module android/soong +go 1.19 + require ( - google.golang.org/protobuf v0.0.0 - github.com/google/blueprint v0.0.0 - prebuilts/bazel/common/proto/analysis_v2 v0.0.0 - prebuilts/bazel/common/proto/build v0.0.0 // indirect + github.com/google/blueprint v0.0.0 + google.golang.org/protobuf v0.0.0 + prebuilts/bazel/common/proto/analysis_v2 v0.0.0 ) - -replace ( - google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf - github.com/google/blueprint v0.0.0 => ../blueprint - github.com/google/go-cmp v0.5.5 => ../../external/go-cmp - prebuilts/bazel/common/proto/analysis_v2 => ../../prebuilts/bazel/common/proto/analysis_v2 - prebuilts/bazel/common/proto/build => ../../prebuilts/bazel/common/proto/build -) - -// Indirect deps from golang-protobuf -exclude github.com/golang/protobuf v1.5.0 - -go 2.0 diff --git a/go.work b/go.work new file mode 100644 index 000000000..737a9df96 --- /dev/null +++ b/go.work @@ -0,0 +1,19 @@ +go 1.19 + +use ( + . + ../../external/go-cmp + ../../external/golang-protobuf + ../../prebuilts/bazel/common/proto/analysis_v2 + ../../prebuilts/bazel/common/proto/build + ../blueprint +) + +replace ( + github.com/golang/protobuf v0.0.0 => ../../external/golang-protobuf + github.com/google/blueprint v0.0.0 => ../blueprint + github.com/google/go-cmp v0.0.0 => ../../external/go-cmp + google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf + prebuilts/bazel/common/proto/analysis_v2 v0.0.0 => ../../prebuilts/bazel/common/proto/analysis_v2 + prebuilts/bazel/common/proto/build v0.0.0 => ../../prebuilts/bazel/common/proto/build +)