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

Side by Side Diff: chrome/chrome_utility.gypi

Issue 385873002: Always build nss_decryptor.cc on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« 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 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'variables': { 6 'variables': {
7 'chrome_utility_sources': [ 7 'chrome_utility_sources': [
8 'utility/chrome_content_utility_client.cc', 8 'utility/chrome_content_utility_client.cc',
9 'utility/chrome_content_utility_client.h', 9 'utility/chrome_content_utility_client.h',
10 'utility/chrome_content_utility_ipc_whitelist.cc', 10 'utility/chrome_content_utility_ipc_whitelist.cc',
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'common', 112 'common',
113 ], 113 ],
114 'include_dirs': [ 114 'include_dirs': [
115 '..', 115 '..',
116 '<(grit_out_dir)', 116 '<(grit_out_dir)',
117 ], 117 ],
118 'sources': [ 118 'sources': [
119 '<@(chrome_utility_sources)', 119 '<@(chrome_utility_sources)',
120 ], 120 ],
121 'conditions': [ 121 'conditions': [
122 ['use_openssl==1', {
123 'sources!': [
124 'utility/importer/nss_decryptor.cc',
Ryan Sleevi 2014/07/11 01:05:33 Don't we still want to include this if on Linux, b
davidben 2014/07/11 13:50:50 Hrmf, yeah, you're right. Fixed and filed crbug.co
125 ]
126 }],
127 ['OS!="win" and OS!="mac" and use_openssl==0', { 122 ['OS!="win" and OS!="mac" and use_openssl==0', {
128 'dependencies': [ 123 'dependencies': [
129 '../crypto/crypto.gyp:crypto', 124 '../crypto/crypto.gyp:crypto',
130 ], 125 ],
131 'sources': [ 126 'sources': [
132 'utility/importer/nss_decryptor_system_nss.cc', 127 'utility/importer/nss_decryptor_system_nss.cc',
133 'utility/importer/nss_decryptor_system_nss.h', 128 'utility/importer/nss_decryptor_system_nss.h',
134 ], 129 ],
135 }], 130 }],
136 ['OS!="android"', { 131 ['OS!="android"', {
davidben 2014/07/10 23:48:54 For Android, I believe this block already prevents
137 'sources': [ 132 'sources': [
138 '<@(chrome_utility_importer_sources)', 133 '<@(chrome_utility_importer_sources)',
139 ], 134 ],
140 }], 135 }],
141 ['enable_extensions==1', { 136 ['enable_extensions==1', {
142 'dependencies': [ 137 'dependencies': [
143 '../third_party/libexif/libexif.gyp:libexif', 138 '../third_party/libexif/libexif.gyp:libexif',
144 'common/extensions/api/api.gyp:chrome_api', 139 'common/extensions/api/api.gyp:chrome_api',
145 ], 140 ],
146 'export_dependent_settings': [ 141 'export_dependent_settings': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 }], 179 }],
185 ['safe_browsing==1', { 180 ['safe_browsing==1', {
186 'defines': [ 'FULL_SAFE_BROWSING' ], 181 'defines': [ 'FULL_SAFE_BROWSING' ],
187 }], 182 }],
188 ], 183 ],
189 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 184 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
190 'msvs_disabled_warnings': [ 4267, ], 185 'msvs_disabled_warnings': [ 4267, ],
191 }, 186 },
192 ], 187 ],
193 } 188 }
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