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

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

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « media/media.gyp ('k') | third_party/harfbuzz-ng/harfbuzz.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': [
7 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
8 'conditions': [
9 ['sysroot!=""', {
10 'variables': {
11 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
12 },
13 }, {
14 'variables': {
15 'pkg-config': 'pkg-config'
16 },
17 }],
18 ],
19 }],
20 ],
21
6 'targets': [ 22 'targets': [
7 { 23 {
8 'target_name': 'libssl', 24 'target_name': 'libssl',
9 'type': '<(component)', 25 'type': '<(component)',
10 'product_name': 'crssl', # Don't conflict with OpenSSL's libssl 26 'product_name': 'crssl', # Don't conflict with OpenSSL's libssl
11 'sources': [ 27 'sources': [
12 'ssl/SSLerrs.h', 28 'ssl/SSLerrs.h',
13 'ssl/authcert.c', 29 'ssl/authcert.c',
14 'ssl/bodge/secitem_array.c', 30 'ssl/bodge/secitem_array.c',
15 'ssl/cmpcert.c', 31 'ssl/cmpcert.c',
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 'configurations': { 192 'configurations': {
177 'Debug_Base': { 193 'Debug_Base': {
178 'defines': [ 194 'defines': [
179 'DEBUG', 195 'DEBUG',
180 ], 196 ],
181 }, 197 },
182 }, 198 },
183 }, 199 },
184 ], 200 ],
185 } 201 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | third_party/harfbuzz-ng/harfbuzz.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698