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

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

Issue 1321793002: Roll src/third_party/boringssl/src 12fe1b25e..ac8302a09 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: roll further Created 5 years, 3 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 | « crypto/ec_private_key_openssl.cc ('k') | 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 configs -= [ "//build/config/compiler:chromium_code" ] 55 configs -= [ "//build/config/compiler:chromium_code" ]
56 configs += [ 56 configs += [
57 "//build/config/compiler:no_chromium_code", 57 "//build/config/compiler:no_chromium_code",
58 58
59 # TODO(davidben): Fix size_t truncations in BoringSSL. 59 # TODO(davidben): Fix size_t truncations in BoringSSL.
60 # https://crbug.com/429039 60 # https://crbug.com/429039
61 "//build/config/compiler:no_size_t_to_int_warning", 61 "//build/config/compiler:no_size_t_to_int_warning",
62 ] 62 ]
63 63
64 # Also gets the include dirs from :openssl_config 64 # Also gets the include dirs from :openssl_config
65 include_dirs = [ 65 include_dirs = [ "src/include" ]
66 "src/include",
67
68 # This is for arm_arch.h, which is needed by some asm files. Since the
69 # asm files are generated and kept in a different directory, they
70 # cannot use relative paths to find this file.
71 "src/crypto",
72 ]
73 66
74 if (is_msan) { 67 if (is_msan) {
75 defines += [ "OPENSSL_NO_ASM" ] 68 defines += [ "OPENSSL_NO_ASM" ]
76 } else if (current_cpu == "x64") { 69 } else if (current_cpu == "x64") {
77 if (is_mac || is_ios) { 70 if (is_mac || is_ios) {
78 sources += gypi_values.boringssl_mac_x86_64_sources 71 sources += gypi_values.boringssl_mac_x86_64_sources
79 } else if (is_linux || is_android) { 72 } else if (is_linux || is_android) {
80 sources += gypi_values.boringssl_linux_x86_64_sources 73 sources += gypi_values.boringssl_linux_x86_64_sources
81 } else if (is_win) { 74 } else if (is_win) {
82 deps += [ ":boringssl_asm" ] 75 deps += [ ":boringssl_asm" ]
(...skipping 11 matching lines...) Expand all
94 defines += [ "OPENSSL_NO_ASM" ] 87 defines += [ "OPENSSL_NO_ASM" ]
95 } 88 }
96 } else if (current_cpu == "arm" && (is_linux || is_android)) { 89 } else if (current_cpu == "arm" && (is_linux || is_android)) {
97 sources += gypi_values.boringssl_linux_arm_sources 90 sources += gypi_values.boringssl_linux_arm_sources
98 } else if (current_cpu == "arm64" && (is_linux || is_android)) { 91 } else if (current_cpu == "arm64" && (is_linux || is_android)) {
99 sources += gypi_values.boringssl_linux_aarch64_sources 92 sources += gypi_values.boringssl_linux_aarch64_sources
100 } else { 93 } else {
101 defines += [ "OPENSSL_NO_ASM" ] 94 defines += [ "OPENSSL_NO_ASM" ]
102 } 95 }
103 } 96 }
OLDNEW
« no previous file with comments | « crypto/ec_private_key_openssl.cc ('k') | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698