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

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: Adding simulator fix. 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 rebase_path(android_toolchain_root, root_build_dir) 75 rebase_path(android_toolchain_root, root_build_dir)
76 76
77 # Else /usr/bin/as gets picked up. 77 # Else /usr/bin/as gets picked up.
78 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] 78 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ]
79 } 79 }
80 } 80 }
81 81
82 if (is_msan) { 82 if (is_msan) {
83 public_configs = [ ":no_asm_config" ] 83 public_configs = [ ":no_asm_config" ]
84 } else if (current_cpu == "x64") { 84 } else if (current_cpu == "x64") {
85 if (is_ios) { 85 if (is_mac) {
86 defines += [ "OPENSSL_NO_ASM" ]
87 } else if (is_mac) {
88 sources += gypi_values.boringssl_mac_x86_64_sources 86 sources += gypi_values.boringssl_mac_x86_64_sources
89 } else if (is_linux || is_android) { 87 } else if (is_linux || is_android) {
90 sources += gypi_values.boringssl_linux_x86_64_sources 88 sources += gypi_values.boringssl_linux_x86_64_sources
91 } else { 89 } else {
92 public_configs = [ ":no_asm_config" ] 90 public_configs = [ ":no_asm_config" ]
93 } 91 }
94 } else if (current_cpu == "x86") { 92 } else if (current_cpu == "x86") {
95 if (is_ios) { 93 if (is_mac) {
96 defines += [ "OPENSSL_NO_ASM" ]
97 } else if (is_mac) {
98 sources += gypi_values.boringssl_mac_x86_sources 94 sources += gypi_values.boringssl_mac_x86_sources
99 } else if (is_linux || is_android) { 95 } else if (is_linux || is_android) {
100 sources += gypi_values.boringssl_linux_x86_sources 96 sources += gypi_values.boringssl_linux_x86_sources
101 } else { 97 } else {
102 public_configs = [ ":no_asm_config" ] 98 public_configs = [ ":no_asm_config" ]
103 } 99 }
104 } else if (current_cpu == "arm" && (is_linux || is_android)) { 100 } else if (current_cpu == "arm" && (is_linux || is_android)) {
105 sources += gypi_values.boringssl_linux_arm_sources 101 sources += gypi_values.boringssl_linux_arm_sources
106 } else if (current_cpu == "arm64" && (is_linux || is_android)) { 102 } else if (current_cpu == "arm64" && (is_linux || is_android)) {
107 sources += gypi_values.boringssl_linux_aarch64_sources 103 sources += gypi_values.boringssl_linux_aarch64_sources
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 183
188 fuzzer_test("boringssl_server_fuzzer") { 184 fuzzer_test("boringssl_server_fuzzer") {
189 sources = [ 185 sources = [
190 "src/fuzz/server.cc", 186 "src/fuzz/server.cc",
191 ] 187 ]
192 deps = [ 188 deps = [
193 ":boringssl_fuzzer", 189 ":boringssl_fuzzer",
194 ] 190 ]
195 seed_corpus = "src/fuzz/server_corpus" 191 seed_corpus = "src/fuzz/server_corpus"
196 } 192 }
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