Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'conditions': [ | 6 'conditions': [ |
| 7 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { | 7 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['sysroot!=""', { | 9 ['sysroot!=""', { |
| 10 'variables': { | 10 'variables': { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 ], | 82 ], |
| 83 'defines!': [ | 83 'defines!': [ |
| 84 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. | 84 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. |
| 85 'NO_NSPR_10_SUPPORT', | 85 'NO_NSPR_10_SUPPORT', |
| 86 ], | 86 ], |
| 87 'dependencies': [ | 87 'dependencies': [ |
| 88 '../../../third_party/zlib/zlib.gyp:zlib', | 88 '../../../third_party/zlib/zlib.gyp:zlib', |
| 89 ], | 89 ], |
| 90 'msvs_disabled_warnings': [4018, 4244], | 90 'msvs_disabled_warnings': [4018, 4244], |
| 91 'conditions': [ | 91 'conditions': [ |
| 92 [ 'clang == 1', { | |
| 93 'cflags': [ | |
| 94 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the | |
| 95 # system's cert.h because cert.h isn't in chromium's repo. | |
|
Ryan Sleevi
2012/08/18 01:33:59
Your comment made it seem like you weren't sure if
wtc
2012/08/18 02:30:07
It may be better to patch sslsecur.c to cast away
| |
| 96 '-Wno-incompatible-pointer-types', | |
| 97 ], | |
| 98 }], | |
| 92 [ 'OS == "mac" or OS == "ios"', { | 99 [ 'OS == "mac" or OS == "ios"', { |
| 93 'defines': [ | 100 'defines': [ |
| 94 'XP_UNIX', | 101 'XP_UNIX', |
| 95 'DARWIN', | 102 'DARWIN', |
| 96 'XP_MACOSX', | 103 'XP_MACOSX', |
| 97 ], | 104 ], |
| 98 }], | 105 }], |
| 99 [ 'OS == "win"', { | 106 [ 'OS == "win"', { |
| 100 'sources!': [ | 107 'sources!': [ |
| 101 'ssl/unix_err.c', | 108 'ssl/unix_err.c', |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 'configurations': { | 172 'configurations': { |
| 166 'Debug_Base': { | 173 'Debug_Base': { |
| 167 'defines': [ | 174 'defines': [ |
| 168 'DEBUG', | 175 'DEBUG', |
| 169 ], | 176 ], |
| 170 }, | 177 }, |
| 171 }, | 178 }, |
| 172 }, | 179 }, |
| 173 ], | 180 ], |
| 174 } | 181 } |
| OLD | NEW |