diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-10 23:05:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-10 23:05:56 +0000 |
| commit | 65121bc9acc982dd798621c1cd4115117e5bebc2 (patch) | |
| tree | 6f80214d2720b24c8dd1d3221e44a143e257c8c0 | |
| parent | 90657402b1b78a0c3760c9cf637e3a34c8d68c16 (diff) | |
| parent | 3f012eaf4c5218a4547ed55682358369aadae0be (diff) | |
| download | starlark-go-android12-d1-s6-release.tar.gz | |
Snap for 7273999 from 3f012eaf4c5218a4547ed55682358369aadae0be to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I6d179d4218e1f5a7c96599c93f335789e87d16ff
| -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 |