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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « chrome/chrome.isolate ('k') | chrome/chrome_dll_bundle.gypi » ('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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 ], 249 ],
250 }, { 250 }, {
251 'dependencies': [ 251 'dependencies': [
252 '<@(chromium_child_dependencies)', 252 '<@(chromium_child_dependencies)',
253 '../content/content.gyp:content_app_both', 253 '../content/content.gyp:content_app_both',
254 ], 254 ],
255 'dependencies!': [ 255 'dependencies!': [
256 '../content/content.gyp:content_app_browser', 256 '../content/content.gyp:content_app_browser',
257 ], 257 ],
258 }], 258 }],
259 ['chrome_multiple_dll==0 and enable_plugins==1', {
260 'dependencies': [
261 '../pdf/pdf.gyp:pdf',
262 ],
263 }],
264 ['cld_version==1', { 259 ['cld_version==1', {
265 'dependencies': [ 260 'dependencies': [
266 '<(DEPTH)/third_party/cld/cld.gyp:cld', 261 '<(DEPTH)/third_party/cld/cld.gyp:cld',
267 ], 262 ],
268 }], 263 }],
269 ['cld_version==0 or cld_version==2', { 264 ['cld_version==0 or cld_version==2', {
270 'dependencies': [ 265 'dependencies': [
271 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', 266 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
272 ], 267 ],
273 }], 268 }],
274 ['OS=="mac" and component!="shared_library"', { 269 ['OS=="mac" and component!="shared_library"', {
275 'includes': [ 'chrome_dll_bundle.gypi' ], 270 'includes': [ 'chrome_dll_bundle.gypi' ],
276 }], 271 }],
277 ['OS=="mac" and component=="shared_library"', { 272 ['OS=="mac" and component=="shared_library"', {
278 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, 273 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
279 }], 274 }],
280 ['OS=="mac"', { 275 ['OS=="mac"', {
281 'xcode_settings': { 276 'xcode_settings': {
282 # Define the order of symbols within the framework. This 277 # Define the order of symbols within the framework. This
283 # sets -order_file. 278 # sets -order_file.
284 'ORDER_FILE': 'app/framework.order', 279 'ORDER_FILE': 'app/framework.order',
285 }, 280 },
281 'dependencies': [
282 '../pdf/pdf.gyp:pdf',
283 ],
286 'include_dirs': [ 284 'include_dirs': [
287 '<(grit_out_dir)', 285 '<(grit_out_dir)',
288 ], 286 ],
289 'postbuilds': [ 287 'postbuilds': [
290 { 288 {
291 # This step causes an error to be raised if the .order file 289 # This step causes an error to be raised if the .order file
292 # does not account for all global text symbols. It 290 # does not account for all global text symbols. It
293 # validates the completeness of the .order file. 291 # validates the completeness of the .order file.
294 'postbuild_name': 'Verify global text symbol order', 292 'postbuild_name': 'Verify global text symbol order',
295 'variables': { 293 'variables': {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 }], 365 }],
368 ['chrome_pgo_phase==2', { 366 ['chrome_pgo_phase==2', {
369 'msvs_settings': { 367 'msvs_settings': {
370 'VCLinkerTool': { 368 'VCLinkerTool': {
371 'LinkTimeCodeGeneration': '3', 369 'LinkTimeCodeGeneration': '3',
372 }, 370 },
373 }, 371 },
374 }], 372 }],
375 ] 373 ]
376 }], 374 }],
377 ['enable_plugins==1', {
378 'dependencies': [
379 '../pdf/pdf.gyp:pdf',
380 ],
381 }],
382 ], 375 ],
383 }, # target chrome_child_dll 376 }, # target chrome_child_dll
384 ], 377 ],
385 }], 378 }],
386 ], 379 ],
387 } 380 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698