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

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

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 | « 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': [
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'defines': [ 'OPENSSL_NO_ASM' ], 92 'defines': [ 'OPENSSL_NO_ASM' ],
93 }], 93 }],
94 ] 94 ]
95 }], 95 }],
96 ['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")', {
97 'defines': [ 'OPENSSL_NO_ASM' ], 97 'defines': [ 'OPENSSL_NO_ASM' ],
98 }], 98 }],
99 ], 99 ],
100 'include_dirs': [ 100 'include_dirs': [
101 'src/include', 101 'src/include',
102 # This is for arm_arch.h, which is needed by some asm files. Since the
103 # asm files are generated and kept in a different directory, they
104 # cannot use relative paths to find this file.
105 'src/crypto',
106 ], 102 ],
107 'direct_dependent_settings': { 103 'direct_dependent_settings': {
108 'include_dirs': [ 104 'include_dirs': [
109 'src/include', 105 'src/include',
110 ], 106 ],
111 'conditions': [ 107 'conditions': [
112 ['component == "shared_library"', { 108 ['component == "shared_library"', {
113 'defines': [ 109 'defines': [
114 'BORINGSSL_SHARED_LIBRARY', 110 'BORINGSSL_SHARED_LIBRARY',
115 ], 111 ],
116 }], 112 }],
117 ], 113 ],
118 }, 114 },
119 }, 115 },
120 ], 116 ],
121 } 117 }
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