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

Side by Side Diff: content/content_common.gypi

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 | « content/content_browser.gypi ('k') | content/content_renderer.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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 'public/common/browser_plugin_permission_type.h', 369 'public/common/browser_plugin_permission_type.h',
370 'public/common/common_param_traits.cc', 370 'public/common/common_param_traits.cc',
371 'public/common/common_param_traits.h', 371 'public/common/common_param_traits.h',
372 'public/common/common_param_traits_macros.h', 372 'public/common/common_param_traits_macros.h',
373 'public/common/content_client.cc', 373 'public/common/content_client.cc',
374 'public/common/content_client.h', 374 'public/common/content_client.h',
375 'public/common/window_container_type.cc', 375 'public/common/window_container_type.cc',
376 'public/common/window_container_type.h', 376 'public/common/window_container_type.h',
377 ], 377 ],
378 'conditions': [ 378 'conditions': [
379 ['OS=="linux"', {
380 'link_settings': {
381 'libraries': [
382 '-ldl',
383 ],
384 },
385 }],
379 ['OS=="ios"', { 386 ['OS=="ios"', {
380 'sources/': [ 387 'sources/': [
381 # iOS only needs a small portion of content; exclude all the 388 # iOS only needs a small portion of content; exclude all the
382 # implementation, and re-include what is used. 389 # implementation, and re-include what is used.
383 ['exclude', '\\.(cc|mm)$'], 390 ['exclude', '\\.(cc|mm)$'],
384 ['include', '_ios\\.(cc|mm)$'], 391 ['include', '_ios\\.(cc|mm)$'],
385 ['include', '^public/common/content_client\\.cc$'], 392 ['include', '^public/common/content_client\\.cc$'],
386 ['include', '^public/common/content_constants\\.cc$'], 393 ['include', '^public/common/content_constants\\.cc$'],
387 ['include', '^public/common/content_switches\\.cc$'], 394 ['include', '^public/common/content_switches\\.cc$'],
388 ['include', '^public/common/frame_navigate_params\\.cc$'], 395 ['include', '^public/common/frame_navigate_params\\.cc$'],
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 590 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
584 '<(output)', 591 '<(output)',
585 '<(PRODUCT_DIR)', 592 '<(PRODUCT_DIR)',
586 ], 593 ],
587 'msvs_cygwin_shell': 1, 594 'msvs_cygwin_shell': 1,
588 }, 595 },
589 ] 596 ]
590 }], 597 }],
591 ], 598 ],
592 } 599 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698