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

Side by Side Diff: content/content_browser.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 | « chrome/chrome_tests.gypi ('k') | content/content_common.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 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 # This prevents the inclusion of atlhost.h which paired 1351 # This prevents the inclusion of atlhost.h which paired
1352 # with the windows 8 sdk it does the wrong thing. 1352 # with the windows 8 sdk it does the wrong thing.
1353 '__ATLHOST_H__', 1353 '__ATLHOST_H__',
1354 ], 1354 ],
1355 'link_settings': { 1355 'link_settings': {
1356 'libraries': [ 1356 'libraries': [
1357 '-lcomctl32.lib', 1357 '-lcomctl32.lib',
1358 '-ldinput8.lib', 1358 '-ldinput8.lib',
1359 '-ldwmapi.lib', 1359 '-ldwmapi.lib',
1360 '-ldxguid.lib', 1360 '-ldxguid.lib',
1361 '-loleacc.lib',
1361 '-lsensorsapi.lib', 1362 '-lsensorsapi.lib',
1362 '-lportabledeviceguids.lib', 1363 '-lportabledeviceguids.lib',
1363 ], 1364 ],
1364 'msvs_settings': { 1365 'msvs_settings': {
1365 'VCLinkerTool': { 1366 'VCLinkerTool': {
1366 'DelayLoadDLLs': [ 1367 'DelayLoadDLLs': [
1367 'dinput8.dll', 1368 'dinput8.dll',
1368 'user32.dll', 1369 'user32.dll',
1369 'dwmapi.dll', 1370 'dwmapi.dll',
1370 ], 1371 ],
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 '../third_party/mozilla/NSURL+Utils.m', 1456 '../third_party/mozilla/NSURL+Utils.m',
1456 ], 1457 ],
1457 'sources/': [ 1458 'sources/': [
1458 ['exclude', '^browser/device_orientation/data_fetcher_shared_memory_defa ult.cc$'], 1459 ['exclude', '^browser/device_orientation/data_fetcher_shared_memory_defa ult.cc$'],
1459 ], 1460 ],
1460 'dependencies': [ 1461 'dependencies': [
1461 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor', 1462 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor',
1462 ], 1463 ],
1463 'link_settings': { 1464 'link_settings': {
1464 'libraries': [ 1465 'libraries': [
1466 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
1467 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
1465 '$(SDKROOT)/usr/lib/libbsm.dylib', 1468 '$(SDKROOT)/usr/lib/libbsm.dylib',
1466 ], 1469 ],
1467 }, 1470 },
1468 }], 1471 }],
1469 ['chromeos==1', { 1472 ['chromeos==1', {
1470 'dependencies': [ 1473 'dependencies': [
1471 '../build/linux/system.gyp:dbus', 1474 '../build/linux/system.gyp:dbus',
1472 ], 1475 ],
1473 'sources!': [ 1476 'sources!': [
1474 'browser/geolocation/wifi_data_provider_linux.cc', 1477 'browser/geolocation/wifi_data_provider_linux.cc',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ], 1561 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ],
1559 ], 1562 ],
1560 }, { # input_speech==1 1563 }, { # input_speech==1
1561 'dependencies': [ 1564 'dependencies': [
1562 '../third_party/flac/flac.gyp:libflac', 1565 '../third_party/flac/flac.gyp:libflac',
1563 '../third_party/speex/speex.gyp:libspeex', 1566 '../third_party/speex/speex.gyp:libspeex',
1564 ], 1567 ],
1565 }], 1568 }],
1566 ], 1569 ],
1567 } 1570 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698