don't build openssl on android

microsoft · Jan 12, 2022 · 7d486e9 · 7d486e9
1 parent 9c1ad50
commit 7d486e9
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 29 deletions.
diff --git a/src/crypto/internal/backend/internal/openssl/aes.go b/src/crypto/internal/backend/internal/openssl/aes.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/aes_test.go b/src/crypto/internal/backend/internal/openssl/aes_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/apibridge_1_1.c b/src/crypto/internal/backend/internal/openssl/apibridge_1_1.c
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 #include "goopenssl.h"
 #include "apibridge_1_1.h"

diff --git a/src/crypto/internal/backend/internal/openssl/apibridge_1_1.h b/src/crypto/internal/backend/internal/openssl/apibridge_1_1.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 // Functions based on OpenSSL 1.1 API, used when building against/running with OpenSSL 1.0.x
 

diff --git a/src/crypto/internal/backend/internal/openssl/ecdsa.go b/src/crypto/internal/backend/internal/openssl/ecdsa.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/goopenssl.c b/src/crypto/internal/backend/internal/openssl/goopenssl.c
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 #include "goopenssl.h"
 

diff --git a/src/crypto/internal/backend/internal/openssl/hmac.go b/src/crypto/internal/backend/internal/openssl/hmac.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/hmac_test.go b/src/crypto/internal/backend/internal/openssl/hmac_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/openssl.go b/src/crypto/internal/backend/internal/openssl/openssl.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 // Package openssl provides access to OpenSSLCrypto implementation functions.
 // Check the constant Enabled to find out whether OpenSSLCrypto is available.

diff --git a/src/crypto/internal/backend/internal/openssl/openssl_lock_setup.c b/src/crypto/internal/backend/internal/openssl/openssl_lock_setup.c
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 #include "goopenssl.h"
 

diff --git a/src/crypto/internal/backend/internal/openssl/openssl_test.go b/src/crypto/internal/backend/internal/openssl/openssl_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 
@@ -19,6 +19,6 @@ func TestMain(m *testing.M) {
 		fmt.Println("skipping on linux platform without OpenSSL")
 		os.Exit(0)
 	}
-	_ = SetFIPS(true) // Skip the error as we still want to run the tests on machines without FIPS support. 
+	_ = SetFIPS(true) // Skip the error as we still want to run the tests on machines without FIPS support.
 	os.Exit(m.Run())
 }
diff --git a/src/crypto/internal/backend/internal/openssl/rand.go b/src/crypto/internal/backend/internal/openssl/rand.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/rsa.go b/src/crypto/internal/backend/internal/openssl/rsa.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl
 

diff --git a/src/crypto/internal/backend/internal/openssl/sha.go b/src/crypto/internal/backend/internal/openssl/sha.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux && !android
+// +build linux,!android
 
 package openssl