Give compliance a pkgPath
Change the pkgPath of compliance to android/soong/tools/compliance
to distinguish it from the standard library.
Also add a go.mod file so that the Go tools can find the package.
Test: go test ./...
Change-Id: I061be2b91378db6508e9c88be2548648af8be4e7
diff --git a/tools/compliance/Android.bp b/tools/compliance/Android.bp
index 7d0fb90..17ce9d9 100644
--- a/tools/compliance/Android.bp
+++ b/tools/compliance/Android.bp
@@ -113,5 +113,5 @@
"golang-protobuf-encoding-prototext",
"license_metadata_proto",
],
- pkgPath: "compliance",
+ pkgPath: "android/soong/tools/compliance",
}
diff --git a/tools/compliance/cmd/bom.go b/tools/compliance/cmd/bom.go
index ec01603..aaec786 100644
--- a/tools/compliance/cmd/bom.go
+++ b/tools/compliance/cmd/bom.go
@@ -16,7 +16,6 @@
import (
"bytes"
- "compliance"
"flag"
"fmt"
"io"
@@ -24,6 +23,8 @@
"os"
"path/filepath"
"strings"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/cmd/checkshare.go b/tools/compliance/cmd/checkshare.go
index e2735c3..752d14b 100644
--- a/tools/compliance/cmd/checkshare.go
+++ b/tools/compliance/cmd/checkshare.go
@@ -15,13 +15,14 @@
package main
import (
- "compliance"
"flag"
"fmt"
"io"
"os"
"path/filepath"
"sort"
+
+ "android/soong/tools/compliance"
)
func init() {
diff --git a/tools/compliance/cmd/dumpgraph.go b/tools/compliance/cmd/dumpgraph.go
index 76fdff3..02ab025 100644
--- a/tools/compliance/cmd/dumpgraph.go
+++ b/tools/compliance/cmd/dumpgraph.go
@@ -15,7 +15,6 @@
package main
import (
- "compliance"
"flag"
"fmt"
"io"
@@ -23,6 +22,8 @@
"path/filepath"
"sort"
"strings"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/cmd/dumpresolutions.go b/tools/compliance/cmd/dumpresolutions.go
index fc8c47c..463dfad 100644
--- a/tools/compliance/cmd/dumpresolutions.go
+++ b/tools/compliance/cmd/dumpresolutions.go
@@ -15,7 +15,6 @@
package main
import (
- "compliance"
"flag"
"fmt"
"io"
@@ -23,6 +22,8 @@
"path/filepath"
"sort"
"strings"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/cmd/dumpresolutions_test.go b/tools/compliance/cmd/dumpresolutions_test.go
index 1abfac7..50a6319 100644
--- a/tools/compliance/cmd/dumpresolutions_test.go
+++ b/tools/compliance/cmd/dumpresolutions_test.go
@@ -16,10 +16,11 @@
import (
"bytes"
- "compliance"
"fmt"
"strings"
"testing"
+
+ "android/soong/tools/compliance"
)
func Test_plaintext(t *testing.T) {
diff --git a/tools/compliance/cmd/htmlnotice.go b/tools/compliance/cmd/htmlnotice.go
index 3456a49..2f59ee0 100644
--- a/tools/compliance/cmd/htmlnotice.go
+++ b/tools/compliance/cmd/htmlnotice.go
@@ -16,7 +16,6 @@
import (
"bytes"
- "compliance"
"flag"
"fmt"
"html"
@@ -25,6 +24,8 @@
"os"
"path/filepath"
"strings"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/cmd/listshare.go b/tools/compliance/cmd/listshare.go
index ae9382e..030caa7 100644
--- a/tools/compliance/cmd/listshare.go
+++ b/tools/compliance/cmd/listshare.go
@@ -15,7 +15,6 @@
package main
import (
- "compliance"
"flag"
"fmt"
"io"
@@ -23,6 +22,8 @@
"path/filepath"
"sort"
"strings"
+
+ "android/soong/tools/compliance"
)
func init() {
diff --git a/tools/compliance/cmd/shippedlibs.go b/tools/compliance/cmd/shippedlibs.go
index ee74cad..fddc489 100644
--- a/tools/compliance/cmd/shippedlibs.go
+++ b/tools/compliance/cmd/shippedlibs.go
@@ -16,13 +16,14 @@
import (
"bytes"
- "compliance"
"flag"
"fmt"
"io"
"io/fs"
"os"
"path/filepath"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/cmd/textnotice.go b/tools/compliance/cmd/textnotice.go
index 658d609..b89aff1 100644
--- a/tools/compliance/cmd/textnotice.go
+++ b/tools/compliance/cmd/textnotice.go
@@ -16,7 +16,6 @@
import (
"bytes"
- "compliance"
"flag"
"fmt"
"io"
@@ -24,6 +23,8 @@
"os"
"path/filepath"
"strings"
+
+ "android/soong/tools/compliance"
)
var (
diff --git a/tools/compliance/go.mod b/tools/compliance/go.mod
new file mode 100644
index 0000000..61e2158
--- /dev/null
+++ b/tools/compliance/go.mod
@@ -0,0 +1,18 @@
+module android/soong/tools/compliance
+
+require google.golang.org/protobuf v0.0.0
+
+replace google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf
+
+require android/soong v0.0.0
+
+replace android/soong v0.0.0 => ../../../soong
+// 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.18