Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: third_party/boringssl/BUILD.gn

Issue 1871043003: Fixing BoringSSL on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix TARGET_IPHONE_SIMULATOR case. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« net/cert/cert_verify_proc_ios.cc ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//testing/libfuzzer/fuzzer_test.gni") 7 import("//testing/libfuzzer/fuzzer_test.gni")
8 8
9 # Config for us and everybody else depending on BoringSSL. 9 # Config for us and everybody else depending on BoringSSL.
10 config("external_config") { 10 config("external_config") {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 rebase_path(android_toolchain_root, root_build_dir) 76 rebase_path(android_toolchain_root, root_build_dir)
77 77
78 # Else /usr/bin/as gets picked up. 78 # Else /usr/bin/as gets picked up.
79 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] 79 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ]
80 } 80 }
81 } 81 }
82 82
83 if (is_msan) { 83 if (is_msan) {
84 public_configs = [ ":no_asm_config" ] 84 public_configs = [ ":no_asm_config" ]
85 } else if (current_cpu == "x64") { 85 } else if (current_cpu == "x64") {
86 if (is_ios) { 86 if (is_mac) {
87 defines += [ "OPENSSL_NO_ASM" ]
88 } else if (is_mac) {
89 sources += gypi_values.boringssl_mac_x86_64_sources 87 sources += gypi_values.boringssl_mac_x86_64_sources
90 } else if (is_linux || is_android) { 88 } else if (is_linux || is_android) {
91 sources += gypi_values.boringssl_linux_x86_64_sources 89 sources += gypi_values.boringssl_linux_x86_64_sources
92 } else { 90 } else {
93 public_configs = [ ":no_asm_config" ] 91 public_configs = [ ":no_asm_config" ]
94 } 92 }
95 } else if (current_cpu == "x86") { 93 } else if (current_cpu == "x86") {
96 if (is_ios) { 94 if (is_mac) {
97 defines += [ "OPENSSL_NO_ASM" ]
98 } else if (is_mac) {
99 sources += gypi_values.boringssl_mac_x86_sources 95 sources += gypi_values.boringssl_mac_x86_sources
100 } else if (is_linux || is_android) { 96 } else if (is_linux || is_android) {
101 sources += gypi_values.boringssl_linux_x86_sources 97 sources += gypi_values.boringssl_linux_x86_sources
102 } else { 98 } else {
103 public_configs = [ ":no_asm_config" ] 99 public_configs = [ ":no_asm_config" ]
104 } 100 }
105 } else if (current_cpu == "arm" && (is_linux || is_android)) { 101 } else if (current_cpu == "arm" && (is_linux || is_android)) {
106 sources += gypi_values.boringssl_linux_arm_sources 102 sources += gypi_values.boringssl_linux_arm_sources
107 } else if (current_cpu == "arm64" && (is_linux || is_android)) { 103 } else if (current_cpu == "arm64" && (is_linux || is_android)) {
108 sources += gypi_values.boringssl_linux_aarch64_sources 104 sources += gypi_values.boringssl_linux_aarch64_sources
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 184
189 fuzzer_test("boringssl_server_fuzzer") { 185 fuzzer_test("boringssl_server_fuzzer") {
190 sources = [ 186 sources = [
191 "src/fuzz/server.cc", 187 "src/fuzz/server.cc",
192 ] 188 ]
193 deps = [ 189 deps = [
194 ":boringssl_fuzzer", 190 ":boringssl_fuzzer",
195 ] 191 ]
196 seed_corpus = "src/fuzz/server_corpus" 192 seed_corpus = "src/fuzz/server_corpus"
197 } 193 }
OLDNEW
« net/cert/cert_verify_proc_ios.cc ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698