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

Side by Side Diff: content/content_browser.gypi

Issue 59323007: Make dbus-based wifi data provider optional on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder gyp variable Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/geolocation/empty_wifi_data_provider.cc ('k') | content/content_tests.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 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 'dinput8.dll', 1385 'dinput8.dll',
1386 'user32.dll', 1386 'user32.dll',
1387 'dwmapi.dll', 1387 'dwmapi.dll',
1388 ], 1388 ],
1389 }, 1389 },
1390 }, 1390 },
1391 }, 1391 },
1392 }], 1392 }],
1393 ['toolkit_uses_gtk == 1', { 1393 ['toolkit_uses_gtk == 1', {
1394 'dependencies': [ 1394 'dependencies': [
1395 '../build/linux/system.gyp:dbus',
1396 # For FcLangSetAdd call in render_sandbox_host_linux.cc 1395 # For FcLangSetAdd call in render_sandbox_host_linux.cc
1397 '../build/linux/system.gyp:fontconfig', 1396 '../build/linux/system.gyp:fontconfig',
1398 '../build/linux/system.gyp:gtk', 1397 '../build/linux/system.gyp:gtk',
1399 # For XShm* in backing_store_x.cc 1398 # For XShm* in backing_store_x.cc
1400 '../build/linux/system.gyp:x11', 1399 '../build/linux/system.gyp:x11',
1401 '../dbus/dbus.gyp:dbus',
1402 ], 1400 ],
1403 }], 1401 }],
1404 ['OS=="linux"', { 1402 ['OS=="linux"', {
1405 'dependencies': [ 1403 'dependencies': [
1406 '../build/linux/system.gyp:udev', 1404 '../build/linux/system.gyp:udev',
1407 '../sandbox/sandbox.gyp:libc_urandom_override', 1405 '../sandbox/sandbox.gyp:libc_urandom_override',
1408 ], 1406 ],
1409 }], 1407 }],
1410 ['OS=="linux" and use_aura==1', { 1408 ['OS=="linux" and use_aura==1', {
1411 'dependencies': [ 1409 'dependencies': [
1412 '../build/linux/system.gyp:dbus',
1413 '../build/linux/system.gyp:fontconfig', 1410 '../build/linux/system.gyp:fontconfig',
1414 '../dbus/dbus.gyp:dbus',
1415 ], 1411 ],
1416 }], 1412 }],
1417 ['use_x11==1', { 1413 ['use_x11==1', {
1418 'dependencies': [ 1414 'dependencies': [
1419 '../build/linux/system.gyp:x11', 1415 '../build/linux/system.gyp:x11',
1420 ], 1416 ],
1421 }], 1417 }],
1422 ['use_pango==1', { 1418 ['use_pango==1', {
1423 'dependencies': [ 1419 'dependencies': [
1424 '../build/linux/system.gyp:pangocairo', 1420 '../build/linux/system.gyp:pangocairo',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 '../third_party/mozilla/NSPasteboard+Utils.h', 1463 '../third_party/mozilla/NSPasteboard+Utils.h',
1468 '../third_party/mozilla/NSPasteboard+Utils.mm', 1464 '../third_party/mozilla/NSPasteboard+Utils.mm',
1469 '../third_party/mozilla/NSString+Utils.h', 1465 '../third_party/mozilla/NSString+Utils.h',
1470 '../third_party/mozilla/NSString+Utils.mm', 1466 '../third_party/mozilla/NSString+Utils.mm',
1471 '../third_party/mozilla/NSURL+Utils.h', 1467 '../third_party/mozilla/NSURL+Utils.h',
1472 '../third_party/mozilla/NSURL+Utils.m', 1468 '../third_party/mozilla/NSURL+Utils.m',
1473 ], 1469 ],
1474 'sources/': [ 1470 'sources/': [
1475 ['exclude', '^browser/device_orientation/data_fetcher_shared_memory_defa ult.cc$'], 1471 ['exclude', '^browser/device_orientation/data_fetcher_shared_memory_defa ult.cc$'],
1476 ], 1472 ],
1473 'sources!': [
1474 'browser/geolocation/empty_wifi_data_provider.cc',
1475 ],
1477 'dependencies': [ 1476 'dependencies': [
1478 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor', 1477 '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_mot ion_sensor',
1479 ], 1478 ],
1480 'link_settings': { 1479 'link_settings': {
1481 'libraries': [ 1480 'libraries': [
1482 '$(SDKROOT)/usr/lib/libbsm.dylib', 1481 '$(SDKROOT)/usr/lib/libbsm.dylib',
1483 ], 1482 ],
1484 }, 1483 },
1485 }], 1484 }],
1486 ['chromeos==1', { 1485 ['chromeos==1', {
1487 'dependencies': [ 1486 'dependencies': [
1488 '../build/linux/system.gyp:dbus', 1487 '../build/linux/system.gyp:dbus',
1489 ], 1488 ],
1490 'sources!': [ 1489 'sources!': [
1491 'browser/geolocation/wifi_data_provider_linux.cc', 1490 'browser/geolocation/wifi_data_provider_linux.cc',
1492 'browser/power_save_blocker_ozone.cc', 1491 'browser/power_save_blocker_ozone.cc',
1493 'browser/power_save_blocker_x11.cc', 1492 'browser/power_save_blocker_x11.cc',
1494 'browser/renderer_host/gtk_key_bindings_handler.cc', 1493 'browser/renderer_host/gtk_key_bindings_handler.cc',
1495 'browser/renderer_host/gtk_key_bindings_handler.h', 1494 'browser/renderer_host/gtk_key_bindings_handler.h',
1496 ], 1495 ],
1497 }], 1496 }],
1498 ['os_bsd==1', { 1497 ['os_bsd==1', {
1499 'sources/': [ 1498 'sources/': [
1500 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ], 1499 ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$' ],
1501 ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'],
1502 ], 1500 ],
1503 }], 1501 }],
1504 ['use_aura!=1 and OS!="win"', { 1502 ['use_aura!=1 and OS!="win"', {
1505 'sources!': [ 1503 'sources!': [
1506 'browser/renderer_host/ui_events_helper.cc', 1504 'browser/renderer_host/ui_events_helper.cc',
1507 'browser/renderer_host/ui_events_helper.h', 1505 'browser/renderer_host/ui_events_helper.h',
1508 ], 1506 ],
1509 }], 1507 }],
1510 ['use_aura!=1 and OS!="win" and OS!="android"', { 1508 ['use_aura!=1 and OS!="win" and OS!="android"', {
1511 'sources!': [ 1509 'sources!': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 ['input_speech==0', { 1575 ['input_speech==0', {
1578 'sources/': [ 1576 'sources/': [
1579 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ], 1577 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.(cc|h)$' ],
1580 ], 1578 ],
1581 }, { # input_speech==1 1579 }, { # input_speech==1
1582 'dependencies': [ 1580 'dependencies': [
1583 '../third_party/flac/flac.gyp:libflac', 1581 '../third_party/flac/flac.gyp:libflac',
1584 '../third_party/speex/speex.gyp:libspeex', 1582 '../third_party/speex/speex.gyp:libspeex',
1585 ], 1583 ],
1586 }], 1584 }],
1585 ['OS == "win"', {
1586 'sources!': [
1587 'browser/geolocation/empty_wifi_data_provider.cc',
1588 ],
1589 }],
1590 ['OS == "linux" and use_dbus==1', {
1591 'sources!': [
1592 'browser/geolocation/empty_wifi_data_provider.cc',
1593 ],
1594 'dependencies': [
1595 '../build/linux/system.gyp:dbus',
1596 '../dbus/dbus.gyp:dbus',
1597 ],
1598 }, { # OS != "linux" or use_dbus==0
1599 'sources!': [
1600 'browser/geolocation/wifi_data_provider_linux.cc',
1601 ],
1602 }],
1587 ], 1603 ],
1588 } 1604 }
OLDNEW
« no previous file with comments | « content/browser/geolocation/empty_wifi_data_provider.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698