commit be149d2f3abdb503bb6d69659a07b31c58d8c92f
author Aaron Green <aarongreen@google.com> Tue Oct 16 14:06:20 2018 -0700
committer Aaron Green <aarongreen@google.com> Tue Oct 16 21:59:33 2018 +0000
tree 2555a64dcd3f59ba4df2857e4ba6798c17abdddc
parent e998ba2d62eb078188bb33f0e1589152a13c060e

[boringssl] Refactor arch/os specific GN

This CL condenses the CPU and OS detection and pulls it out of the
libcrypto rule.  There's only three supported cases and enumerating
them makes them much clearer.

SEC-44 #comment Using boringssl as an example

Change-Id: I993103699f506163a2de907460d41e36ed9e639a
Tests: Garnet's boringssl_tests

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 0e02dab..8a8a3bb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,6 +23,16 @@
   library_type = default_library_type
 }
 
+if (current_cpu == "arm64" && (is_fuchsia || is_linux)) {
+  crypto_sources += crypto_sources_linux_aarch64
+} else if (current_cpu == "x64" && (is_fuchsia || is_linux)) {
+  crypto_sources += crypto_sources_linux_x86_64
+} else if (current_cpu == "x64" && is_mac) {
+  crypto_sources += crypto_sources_mac_x86_64
+} else {
+  assert(false, "unsupported OS or CPU: {{current_os}}/{{current_cpu}}")
+}
+
 ################
 # libcrypto.so #
 ################
@@ -34,40 +44,11 @@
   public = crypto_headers
   public_configs = [ ":boringssl_config" ]
   configs += [ ":internal_config" ]
-  if (current_cpu == "arm64") {
-    if (is_mac) {
-      sources += crypto_sources_ios_aarch64
-      configs += [ ":pthread_config" ]
-    } else if (is_fuchsia) {
-      # TODO(aarongreen): Switch once aarch64 once crypto/cpu-aarch64-fuchsia.c
-      # is upstreamed.
-      # sources += crypto_sources_linux_aarch64
-      configs += [ ":no_asm_config" ]
-    } else if (is_linux) {
-      sources += crypto_sources_linux_aarch64
-      configs += [ ":pthread_config" ]
-    } else {
-      assert(false, "unsupported OS: {{current_os}}")
-    }
-  } else if (current_cpu == "x64") {
-    if (is_mac) {
-      sources += crypto_sources_mac_x86_64
-      configs += [ ":pthread_config" ]
-    } else if (is_fuchsia) {
-      # Fuchsia assembly is the same as Linux on x86-64, for now; i.e. ELF.
-      sources += crypto_sources_linux_x86_64
-    } else if (is_linux) {
-      sources += crypto_sources_linux_x86_64
-      configs += [ ":pthread_config" ]
-    } else {
-      assert(false, "unsupported OS: {{current_os}}")
-    }
-  } else {
-    assert(false, "unsupported CPU: {{current_cpu}}")
-  }
   if (is_fuchsia) {
     include_base = "//third_party/boringssl/src/include"
     deps = [ "//zircon/public/lib/zxcpp" ]
+  } else {
+    configs += [ ":host_config" ]
   }
 }
 
@@ -223,15 +204,12 @@
   ]
 }
 
-config("pthread_config") {
+config("host_config") {
+  visibility = [ ":*" ]
   # pthread_rwlock_t on host requires a feature flag.
   defines = [ "_XOPEN_SOURCE=700" ]
 }
 
-config("no_asm_config") {
-  defines = [ "OPENSSL_NO_ASM" ]
-}
-
 config("test_config") {
   visibility = [ ":*" ]
   include_dirs = [