From 16e9cadb5a5e9211740bcadebb36c448391dca1e Mon Sep 17 00:00:00 2001 From: Ian Hu Date: Wed, 13 Oct 2021 15:45:06 +0800 Subject: [PATCH 1/2] Fix build in android --- user_posix.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_posix.go b/user_posix.go index 227a948e..d465867c 100644 --- a/user_posix.go +++ b/user_posix.go @@ -1,7 +1,7 @@ // Package pq is a pure Go Postgres driver for the database/sql package. -//go:build aix || darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos -// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris rumprun illumos +//go:build aix || darwin || dragonfly || freebsd || (linux && !android) || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos +// +build aix darwin dragonfly freebsd (linux && !android) nacl netbsd openbsd plan9 solaris rumprun illumos package pq From b33a1b722c28a144366eec52c9f6f811fcf9efc6 Mon Sep 17 00:00:00 2001 From: Ian Hu Date: Wed, 13 Oct 2021 15:51:25 +0800 Subject: [PATCH 2/2] Fix android build --- user_posix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_posix.go b/user_posix.go index d465867c..5f2d439b 100644 --- a/user_posix.go +++ b/user_posix.go @@ -1,7 +1,7 @@ // Package pq is a pure Go Postgres driver for the database/sql package. //go:build aix || darwin || dragonfly || freebsd || (linux && !android) || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos -// +build aix darwin dragonfly freebsd (linux && !android) nacl netbsd openbsd plan9 solaris rumprun illumos +// +build aix darwin dragonfly freebsd linux,!android nacl netbsd openbsd plan9 solaris rumprun illumos package pq