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

Side by Side Diff: third_party/boringssl/boringssl.gyp

Issue 1459783002: Roll src/third_party/boringssl/src d7421ebf6..3ac32b1ed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build, estark comments Created 5 years, 1 month 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 | « third_party/boringssl/BUILD.gn ('k') | third_party/boringssl/boringssl.gypi » ('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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'boringssl', 8 'target_name': 'boringssl',
9 'type': '<(component)', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
11 'boringssl.gypi', 11 'boringssl.gypi',
12 ], 12 ],
13 'sources': [ 13 'sources': [
14 '<@(boringssl_crypto_sources)', 14 '<@(boringssl_crypto_sources)',
15 '<@(boringssl_ssl_sources)', 15 '<@(boringssl_ssl_sources)',
16 ], 16 ],
17 'defines': [ 17 'defines': [
18 'BORINGSSL_IMPLEMENTATION', 18 'BORINGSSL_IMPLEMENTATION',
19 'BORINGSSL_NO_STATIC_INITIALIZER', 19 'BORINGSSL_NO_STATIC_INITIALIZER',
20 'OPENSSL_SMALL',
21 ], 20 ],
22 # TODO(davidben): Fix size_t truncations in BoringSSL. 21 # TODO(davidben): Fix size_t truncations in BoringSSL.
23 # https://crbug.com/429039 22 # https://crbug.com/429039
24 'msvs_disabled_warnings': [ 4267, ], 23 'msvs_disabled_warnings': [ 4267, ],
25 'conditions': [ 24 'conditions': [
26 ['component == "shared_library"', { 25 ['component == "shared_library"', {
27 'defines': [ 26 'defines': [
28 'BORINGSSL_SHARED_LIBRARY', 27 'BORINGSSL_SHARED_LIBRARY',
29 ], 28 ],
30 }], 29 }],
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ] 94 ]
96 }], 95 }],
97 ['msan == 1 or (target_arch != "arm" and target_arch != "ia32" and targe t_arch != "x64" and target_arch != "arm64")', { 96 ['msan == 1 or (target_arch != "arm" and target_arch != "ia32" and targe t_arch != "x64" and target_arch != "arm64")', {
98 'defines': [ 'OPENSSL_NO_ASM' ], 97 'defines': [ 'OPENSSL_NO_ASM' ],
99 }], 98 }],
100 ], 99 ],
101 'include_dirs': [ 100 'include_dirs': [
102 'src/include', 101 'src/include',
103 ], 102 ],
104 'direct_dependent_settings': { 103 'direct_dependent_settings': {
104 'defines': [
105 'OPENSSL_SMALL',
106 ],
105 'include_dirs': [ 107 'include_dirs': [
106 'src/include', 108 'src/include',
107 ], 109 ],
108 'conditions': [ 110 'conditions': [
109 ['component == "shared_library"', { 111 ['component == "shared_library"', {
110 'defines': [ 112 'defines': [
111 'BORINGSSL_SHARED_LIBRARY', 113 'BORINGSSL_SHARED_LIBRARY',
112 ], 114 ],
113 }], 115 }],
114 ], 116 ],
115 }, 117 },
116 }, 118 },
117 ], 119 ],
118 } 120 }
OLDNEW
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | third_party/boringssl/boringssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698