Allow Soongs/blueprint's microfactory build starlark-go am: 9ff3db46c2 am: 87b79b8fa6 am: 96856bab52 am: 3f012eaf4c
Original change: https://android-review.googlesource.com/c/platform/external/starlark-go/+/1672645
Change-Id: I5e736e6fcefcac5062e92e4b7ebb91ff9d546600
diff --git a/starlark/int_generic.go b/starlark/int_generic.go
index 9e84d7f..8eed77d 100644
--- a/starlark/int_generic.go
+++ b/starlark/int_generic.go
@@ -1,5 +1,6 @@
-//+build !linux,!darwin,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris darwin,arm64 !amd64,!arm64,!mips64x,!ppc64x
-
+// Always use this implementation, even for Posix-compliant platforms
+// (upstream code uses the implementation in int_posix64.go, but we
+// do not want to depend on golang.olg/x.sys/unix package).
package starlark
// generic Int implementation as a union
diff --git a/starlark/int_posix64.go b/starlark/int_posix64.go
index 1f13d66..2c49d94 100644
--- a/starlark/int_posix64.go
+++ b/starlark/int_posix64.go
@@ -1,5 +1,6 @@
-//+build linux darwin dragonfly freebsd netbsd openbsd solaris
-//+build amd64 arm64,!darwin mips64x ppc64x
+// For the android builds, ignore this file to avoid dependency
+// on yet another package (golang.org/x/sys/unix)
+//+build ignore
package starlark
