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

Side by Side Diff: third_party/boringssl/boringssl_configurations.gypi

Issue 1319703002: Breaking Change: merge BoringSSL branch into master (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: 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/boringssl.gypi ('k') | third_party/boringssl/boringssl_dart.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 (c) 2012, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 # This file is included to modify the configurations to build third-party 5 # This file is included to modify the configurations to build third-party
6 # code from Mozilla's NSS and NSPR libraries, modified by the Chromium project. 6 # code from BoringSSL.
7 # This code is C code, not C++, and is not warning-free, so we need to remove 7 # This code is C code, not C++, and is not warning-free, so we need to remove
8 # C++-specific flags, and add flags to supress the warnings in the code. 8 # C++-specific flags, and add flags to supress the warnings in the code.
9 # This file is included from gyp files in the runtime/bin/net directory.
10 { 9 {
11 'variables': { 10 'variables': {
12 # Used by third_party/nss, which is from Chromium. 11 # Used by third_party/nss, which is from Chromium.
13 # Include the built-in set of root certificate authorities. 12 # Include the built-in set of root certificate authorities.
14 'exclude_nss_root_certs': 0, 13 'exclude_nss_root_certs': 0,
15 'os_posix%': 1, 14 'os_posix%': 1,
16 'os_bsd%': 0, 15 'os_bsd%': 0,
17 'chromeos%': 0, 16 'chromeos%': 0,
18 'clang%': 0, 17 'clang%': 0,
19 }, 18 },
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 ], 89 ],
91 # Define __linux__ on Android build for NSS. 90 # Define __linux__ on Android build for NSS.
92 'cflags!': [ 91 'cflags!': [
93 '-U__linux__', 92 '-U__linux__',
94 ], 93 ],
95 }] 94 }]
96 ], 95 ],
97 }, 96 },
98 }, 97 },
99 }, 98 },
100 } 99 }
OLDNEW
« no previous file with comments | « third_party/boringssl/boringssl.gypi ('k') | third_party/boringssl/boringssl_dart.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698