Merge "disable openssl for android/amd64"
diff --git a/security/ecdsa_go.go b/security/ecdsa_go.go
index 86d0016..30ed8d8 100644
--- a/security/ecdsa_go.go
+++ b/security/ecdsa_go.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 !cgo noopenssl !linux,!openssl !amd64,!openssl
+// +build !cgo noopenssl !linux,!openssl android !amd64,!openssl
// See comments in ecdsa_openssl.go for an explanation of the choice of
// build tags.
diff --git a/security/ecdsa_openssl.go b/security/ecdsa_openssl.go
index 2d2794c..e2914bc 100644
--- a/security/ecdsa_openssl.go
+++ b/security/ecdsa_openssl.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,cgo,!noopenssl openssl,cgo
+// +build !android,linux,amd64,cgo,!noopenssl openssl,cgo
// The purpose of this file is to improve performance, as demonstrated by
// benchmarks when linked against openssl-1.0.1f (with further improvements in
diff --git a/security/ecdsa_openssl_test.go b/security/ecdsa_openssl_test.go
index af6f5ec..70408f6 100644
--- a/security/ecdsa_openssl_test.go
+++ b/security/ecdsa_openssl_test.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,cgo,!noopenssl openssl,cgo
+// +build !android,linux,amd64,cgo,!noopenssl openssl,cgo
package security
diff --git a/security/openssl.c b/security/openssl.c
index 147e46d..3affff7 100644
--- a/security/openssl.c
+++ b/security/openssl.c
@@ -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,cgo,!noopenssl openssl,cgo
+// +build !android,linux,amd64,cgo,!noopenssl openssl,cgo
#include <openssl/crypto.h>
#include <openssl/ec.h>
