aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2017-08-23 19:12:54 -0400
committerRuss Cox <rsc@golang.org>2017-08-26 00:52:35 +0000
commit08c54565dc238f9686f1a81171073cad8bf51647 (patch)
tree32702e53af75f409c91e979541312c5908174aa6
parent1da9aa90bca2e8466f3cd228e3343f93ce164a2a (diff)
downloadgo-08c54565dc238f9686f1a81171073cad8bf51647.tar.gz
go-08c54565dc238f9686f1a81171073cad8bf51647.zip
[dev.boringcrypto.go1.8] crypto/internal/boring: disable for android & non-cgo builds
Change-Id: Ia4458090118c4391a73cf1ae65bc8d187f03eca0 Reviewed-on: https://go-review.googlesource.com/58250 Reviewed-by: Adam Langley <agl@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
-rw-r--r--src/crypto/internal/boring/aes.go1
-rw-r--r--src/crypto/internal/boring/boring.go1
-rw-r--r--src/crypto/internal/boring/ecdsa.go1
-rw-r--r--src/crypto/internal/boring/hmac.go1
-rw-r--r--src/crypto/internal/boring/notboring.go2
-rw-r--r--src/crypto/internal/boring/rand.go1
-rw-r--r--src/crypto/internal/boring/rsa.go1
-rw-r--r--src/crypto/internal/boring/sha.go1
8 files changed, 8 insertions, 1 deletions
diff --git a/src/crypto/internal/boring/aes.go b/src/crypto/internal/boring/aes.go
index 225d7469c5..a977158c18 100644
--- 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 b2d47c036f..97659e4ff7 100644
--- 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 36176efccd..f931d732f4 100644
--- 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 f4497e91f6..a547438222 100644
--- 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 c8bcf66fc6..22f3553324 100644
--- 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 522bc33978..71c644bdf4 100644
--- 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 241560980f..0066520bf3 100644
--- 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 6d0532b774..bc91f4a490 100644
--- 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