diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-11 00:09:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-11 00:09:14 +0000 |
| commit | 06aa9096aaf51a20d3d2af2a75a3675aa8a2e944 (patch) | |
| tree | 6f80214d2720b24c8dd1d3221e44a143e257c8c0 | |
| parent | 2632484280e37fb60c96dc8444f889699cdf9476 (diff) | |
| parent | f954ac67dcb886d59d366565fd93e5ee03cdce21 (diff) | |
| download | starlark-go-android12-gsi.tar.gz | |
Snap for 7273999 from 3f012eaf4c5218a4547ed55682358369aadae0be to sc-release am: f954ac67dcandroid12-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/starlark-go/+/14152975
Change-Id: I80c5073a2ed38a5edcf9d9911782ed9c32b2c545
| -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 |