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

Side by Side Diff: net/third_party/nss/ssl.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « net/net.gyp ('k') | printing/printing.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 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 [ 'OS == "mac" or OS == "ios"', { 118 [ 'OS == "mac" or OS == "ios"', {
119 'defines': [ 119 'defines': [
120 'XP_UNIX', 120 'XP_UNIX',
121 'DARWIN', 121 'DARWIN',
122 'XP_MACOSX', 122 'XP_MACOSX',
123 ], 123 ],
124 }], 124 }],
125 [ 'OS == "mac"', { 125 [ 'OS == "mac"', {
126 'link_settings': { 126 'link_settings': {
127 'libraries': [ 127 'libraries': [
128 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
128 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 129 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
129 ], 130 ],
130 }, 131 },
131 }], 132 }],
132 [ 'OS == "win"', { 133 [ 'OS == "win"', {
133 'sources!': [ 134 'sources!': [
134 'ssl/unix_err.c', 135 'ssl/unix_err.c',
135 'ssl/unix_err.h', 136 'ssl/unix_err.h',
136 ], 137 ],
137 }, 138 },
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 'configurations': { 191 'configurations': {
191 'Debug_Base': { 192 'Debug_Base': {
192 'defines': [ 193 'defines': [
193 'DEBUG', 194 'DEBUG',
194 ], 195 ],
195 }, 196 },
196 }, 197 },
197 }, 198 },
198 ], 199 ],
199 } 200 }
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698