Commit 2e340510 authored by svaldez's avatar svaldez Committed by Commit bot

Fix BoringSSL build on iOS

In order to get BoringSSL to build on iOS we need to make a couple of initial changes:

* We disable unittests due to the current inability to run new processes on iOS.
* We disable the use of custom assembly since we are unable to build the assembly for the iOS architecture and would otherwise be unable to test it.

BUG=591545

Review URL: https://codereview.chromium.org/1809153002

Cr-Commit-Position: refs/heads/master@{#381812}
parent 8ecd31ca
......@@ -82,7 +82,9 @@ if (is_win && !is_msan) {
if (is_msan) {
public_configs = [ ":no_asm_config" ]
} else if (current_cpu == "x64") {
if (is_mac || is_ios) {
if (is_ios) {
defines += [ "OPENSSL_NO_ASM" ]
} else if (is_mac) {
sources += gypi_values.boringssl_mac_x86_64_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_64_sources
......@@ -90,7 +92,9 @@ if (is_win && !is_msan) {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "x86") {
if (is_mac || is_ios) {
if (is_ios) {
defines += [ "OPENSSL_NO_ASM" ]
} else if (is_mac) {
sources += gypi_values.boringssl_mac_x86_sources
} else if (is_linux || is_android) {
sources += gypi_values.boringssl_linux_x86_sources
......
......@@ -108,7 +108,7 @@
'../yasm/yasm_compile.gypi',
],
}],
['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
'direct_dependent_settings': {
'defines': [ 'OPENSSL_NO_ASM' ],
},
......@@ -134,7 +134,7 @@
'../yasm/yasm_compile.gypi',
],
}],
['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
'direct_dependent_settings': {
'defines': [ 'OPENSSL_NO_ASM' ],
},
......
......@@ -6,20 +6,24 @@
'includes': [
'boringssl_tests.gypi',
],
'targets': [
{
'target_name': 'boringssl_unittests',
'type': 'executable',
'sources': [
'boringssl_unittest.cc',
],
'dependencies': [
'<@(boringssl_test_targets)',
'../../base/base.gyp:base',
'../../base/base.gyp:run_all_unittests',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
'conditions': [
['OS!="ios"', {
'targets': [
{
'target_name': 'boringssl_unittests',
'type': 'executable',
'sources': [
'boringssl_unittest.cc',
],
'dependencies': [
'<@(boringssl_test_targets)',
'../../base/base.gyp:base',
'../../base/base.gyp:run_all_unittests',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
],
},
],
},
}],
],
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment