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

Side by Side Diff: Source/web/web.gyp

Issue 688943002: Condition NSS dependency on use_openssl. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 # Compile Blink unittest files into blink_web.dll in com ponent build mode 122 # Compile Blink unittest files into blink_web.dll in com ponent build mode
123 '<@(bindings_unittest_files)', 123 '<@(bindings_unittest_files)',
124 '<@(core_unittest_files)', 124 '<@(core_unittest_files)',
125 '<@(modules_unittest_files)', 125 '<@(modules_unittest_files)',
126 # FIXME: the next line should not be needed. We prefer t o run these unit tests outside blink_web.dll. 126 # FIXME: the next line should not be needed. We prefer t o run these unit tests outside blink_web.dll.
127 '<@(platform_web_unittest_files)', 127 '<@(platform_web_unittest_files)',
128 '<@(web_unittest_files)', 128 '<@(web_unittest_files)',
129 'WebTestingSupport.cpp', 129 'WebTestingSupport.cpp',
130 ], 130 ],
131 'conditions': [ 131 'conditions': [
132 ['OS=="win" or OS=="mac"', { 132 ['use_openssl==0 and (OS=="win" or OS=="mac")', {
133 'dependencies': [ 133 'dependencies': [
134 '<(DEPTH)/third_party/nss/nss.gyp:*', 134 '<(DEPTH)/third_party/nss/nss.gyp:*',
135 ], 135 ],
136 }], 136 }],
137 ], 137 ],
138 'msvs_settings': { 138 'msvs_settings': {
139 'VCLinkerTool': { 139 'VCLinkerTool': {
140 'conditions': [ 140 'conditions': [
141 ['incremental_chrome_dll==1', { 141 ['incremental_chrome_dll==1', {
142 'UseLibraryDependencyInputs': "true", 142 'UseLibraryDependencyInputs': "true",
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ], 249 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ],
250 'copies': [{ 250 'copies': [{
251 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/', 251 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/',
252 'files': ['<(PRODUCT_DIR)/osmesa.so'], 252 'files': ['<(PRODUCT_DIR)/osmesa.so'],
253 }], 253 }],
254 }, 254 },
255 ], 255 ],
256 }], 256 }],
257 ], # conditions 257 ], # conditions
258 } 258 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698