diff options
| author | Sasha Smundak <asmundak@google.com> | 2021-04-10 07:33:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 07:33:11 +0000 |
| commit | 9545ffcaa3b1b2b959143ba5bfad31eacf0d72d6 (patch) | |
| tree | 6f80214d2720b24c8dd1d3221e44a143e257c8c0 | |
| parent | 302b04fab3f3a0500b14b9b462071bd3d917b66a (diff) | |
| parent | 3f012eaf4c5218a4547ed55682358369aadae0be (diff) | |
| download | starlark-go-9545ffcaa3b1b2b959143ba5bfad31eacf0d72d6.tar.gz | |
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: I32c5db1768bb1cbccabe7df5d2c3753979b63453
| -rw-r--r-- | starlark/int_generic.go | 5 | ||||
| -rw-r--r-- | starlark/int_posix64.go | 5 |
2 files changed, 6 insertions, 4 deletions
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 |