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

Side by Side Diff: net/net.gyp

Issue 223143006: Make necessary changes for chromecast build as chromecast has it own implementation of NetworkChang… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a check failure when we don't yet have a NetworkChangeNotifierFactory for chromecast build Created 6 years, 8 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 'ssl/openssl_client_key_store.cc', 1457 'ssl/openssl_client_key_store.cc',
1458 'ssl/openssl_client_key_store.h', 1458 'ssl/openssl_client_key_store.h',
1459 ], 1459 ],
1460 }], 1460 }],
1461 [ 'use_glib == 1', { 1461 [ 'use_glib == 1', {
1462 'dependencies': [ 1462 'dependencies': [
1463 '../build/linux/system.gyp:gconf', 1463 '../build/linux/system.gyp:gconf',
1464 '../build/linux/system.gyp:gio', 1464 '../build/linux/system.gyp:gio',
1465 ], 1465 ],
1466 }], 1466 }],
1467 [ 'desktop_linux == 1 or chromeos == 1', { 1467 [ 'desktop_linux == 1 or chromeos == 1 or chromecast_build==1', {
1468 'conditions': [ 1468 'conditions': [
1469 ['use_openssl == 0', { 1469 ['use_openssl == 0', {
1470 # use NSS 1470 # use NSS
1471 'dependencies': [ 1471 'dependencies': [
1472 '../build/linux/system.gyp:ssl', 1472 '../build/linux/system.gyp:ssl',
1473 ], 1473 ],
1474 }], 1474 }],
1475 ['os_bsd==1', { 1475 ['os_bsd==1 or chromecast_build==1', {
1476 'sources!': [ 1476 'sources!': [
1477 'base/network_change_notifier_linux.cc', 1477 'base/network_change_notifier_linux.cc',
1478 'base/network_change_notifier_netlink_linux.cc', 1478 'base/network_change_notifier_netlink_linux.cc',
1479 'proxy/proxy_config_service_linux.cc', 1479 'proxy/proxy_config_service_linux.cc',
1480 ], 1480 ],
1481 },{ 1481 },{
1482 'dependencies': [ 1482 'dependencies': [
1483 '../build/linux/system.gyp:libresolv', 1483 '../build/linux/system.gyp:libresolv',
1484 ], 1484 ],
1485 }], 1485 }],
(...skipping 1894 matching lines...) Expand 10 before | Expand all | Expand 10 after
3380 'java_in_dir': 'cronet/android/sample/javatests', 3380 'java_in_dir': 'cronet/android/sample/javatests',
3381 'resource_dir': 'cronet/android/sample/res', 3381 'resource_dir': 'cronet/android/sample/res',
3382 'is_test_apk': 1, 3382 'is_test_apk': 1,
3383 }, 3383 },
3384 'includes': [ '../build/java_apk.gypi' ], 3384 'includes': [ '../build/java_apk.gypi' ],
3385 }, 3385 },
3386 ], 3386 ],
3387 }], # OS=="android" 3387 }], # OS=="android"
3388 ], 3388 ],
3389 } 3389 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698