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

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

Issue 1126663002: Use Mac assembly for x86 iOS simulator targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a bit Created 5 years, 7 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
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gyp » ('j') | 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 # Config for us and everybody else depending on BoringSSL. 5 # Config for us and everybody else depending on BoringSSL.
6 config("openssl_config") { 6 config("openssl_config") {
7 include_dirs = [] 7 include_dirs = []
8 include_dirs += [ "src/include" ] 8 include_dirs += [ "src/include" ]
9 if (is_component_build) { 9 if (is_component_build) {
10 defines = [ "BORINGSSL_SHARED_LIBRARY" ] 10 defines = [ "BORINGSSL_SHARED_LIBRARY" ]
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 include_dirs = [ 64 include_dirs = [
65 "src/include", 65 "src/include",
66 66
67 # This is for arm_arch.h, which is needed by some asm files. Since the 67 # This is for arm_arch.h, which is needed by some asm files. Since the
68 # asm files are generated and kept in a different directory, they 68 # asm files are generated and kept in a different directory, they
69 # cannot use relative paths to find this file. 69 # cannot use relative paths to find this file.
70 "src/crypto", 70 "src/crypto",
71 ] 71 ]
72 72
73 if (current_cpu == "x64") { 73 if (current_cpu == "x64") {
74 if (is_mac) { 74 if (is_mac || is_ios) {
75 sources += gypi_values.boringssl_mac_x86_64_sources 75 sources += gypi_values.boringssl_mac_x86_64_sources
76 } else if (is_linux || is_android) { 76 } else if (is_linux || is_android) {
77 sources += gypi_values.boringssl_linux_x86_64_sources 77 sources += gypi_values.boringssl_linux_x86_64_sources
78 } else if (is_win) { 78 } else if (is_win) {
79 deps += [ ":boringssl_asm" ] 79 deps += [ ":boringssl_asm" ]
80 } else { 80 } else {
81 defines += [ "OPENSSL_NO_ASM" ] 81 defines += [ "OPENSSL_NO_ASM" ]
82 } 82 }
83 } else if (current_cpu == "x86") { 83 } else if (current_cpu == "x86") {
84 if (is_mac) { 84 if (is_mac || is_ios) {
85 sources += gypi_values.boringssl_mac_x86_sources 85 sources += gypi_values.boringssl_mac_x86_sources
86 } else if (is_linux || is_android) { 86 } else if (is_linux || is_android) {
87 sources += gypi_values.boringssl_linux_x86_sources 87 sources += gypi_values.boringssl_linux_x86_sources
88 } else if (is_win) { 88 } else if (is_win) {
89 deps += [ ":boringssl_asm" ] 89 deps += [ ":boringssl_asm" ]
90 } else { 90 } else {
91 defines += [ "OPENSSL_NO_ASM" ] 91 defines += [ "OPENSSL_NO_ASM" ]
92 } 92 }
93 } else if (current_cpu == "arm" && (is_linux || is_android)) { 93 } else if (current_cpu == "arm" && (is_linux || is_android)) {
94 sources += gypi_values.boringssl_linux_arm_sources 94 sources += gypi_values.boringssl_linux_arm_sources
95 } else if (current_cpu == "arm64" && (is_linux || is_android)) { 95 } else if (current_cpu == "arm64" && (is_linux || is_android)) {
96 sources += gypi_values.boringssl_linux_aarch64_sources 96 sources += gypi_values.boringssl_linux_aarch64_sources
97 } else { 97 } else {
98 defines += [ "OPENSSL_NO_ASM" ] 98 defines += [ "OPENSSL_NO_ASM" ]
99 } 99 }
100 } 100 }
OLDNEW
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698