[dev.boringcrypto] crypto/internal/boring: disable for android & non-cgo builds

Change-Id: Ia4458090118c4391a73cf1ae65bc8d187f03eca0
Reviewed-on: https://go-review.googlesource.com/59051
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/crypto/internal/boring/aes.go b/src/crypto/internal/boring/aes.go
index 225d7469c5f3d48b6d154bb073231249e693a16d..a977158c189faab466aaa8a824b62bae60959b96 100644 (file)
--- a/src/crypto/internal/boring/aes.go
+++ b/src/crypto/internal/boring/aes.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/boring.go b/src/crypto/internal/boring/boring.go
index b2d47c036fd9e5c040150853d1c355b7a24cd49b..97659e4ff77b89c63671c675531b5d92f1ea7b85 100644 (file)
--- a/src/crypto/internal/boring/boring.go
+++ b/src/crypto/internal/boring/boring.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/ecdsa.go b/src/crypto/internal/boring/ecdsa.go
index 36176efccddcf2f66683977fbd8cd3a997a24b36..f931d732f43fce215782856d58be59417238de4a 100644 (file)
--- a/src/crypto/internal/boring/ecdsa.go
+++ b/src/crypto/internal/boring/ecdsa.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/hmac.go b/src/crypto/internal/boring/hmac.go
index f4497e91f6ccdcf4b8d3f2c0f0ed3af1c8cd29a6..a5474382227705990167a1955b5da0f75bd872c9 100644 (file)
--- a/src/crypto/internal/boring/hmac.go
+++ b/src/crypto/internal/boring/hmac.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/notboring.go b/src/crypto/internal/boring/notboring.go
index c8bcf66fc645ae2297690707eb4c142f75e1052f..22f3553324624e9894ffd22c1e55491a6085ca97 100644 (file)
--- a/src/crypto/internal/boring/notboring.go
+++ b/src/crypto/internal/boring/notboring.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !linux !amd64 cmd_go_bootstrap
+// +build !linux !amd64 cmd_go_bootstrap android !cgo
 
 package boring
 

diff --git a/src/crypto/internal/boring/rand.go b/src/crypto/internal/boring/rand.go
index 522bc339780ba485ee9a09ebc1235f5466272d6b..71c644bdf46b2722dda66a1b46e14200bc89ca2c 100644 (file)
--- a/src/crypto/internal/boring/rand.go
+++ b/src/crypto/internal/boring/rand.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/rsa.go b/src/crypto/internal/boring/rsa.go
index 241560980f5551534891c0fe942c431e5f8d9a68..0066520bf34278a4a64770286460944cb0e9186a 100644 (file)
--- a/src/crypto/internal/boring/rsa.go
+++ b/src/crypto/internal/boring/rsa.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring

diff --git a/src/crypto/internal/boring/sha.go b/src/crypto/internal/boring/sha.go
index 6d0532b774770ce9a41f171b48b974a5aa0fa44f..bc91f4a49018fe9f06627a1694c59c7949090def 100644 (file)
--- a/src/crypto/internal/boring/sha.go
+++ b/src/crypto/internal/boring/sha.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build linux,amd64
+// +build !android
 // +build !cmd_go_bootstrap
 
 package boring