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

Side by Side Diff: net/net.gyp

Issue 747773002: Upstream "nsurl_util.{h,mm}" from Chrome on iOS repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from mmenke, round two. Created 6 years 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 | « net/base/mac/url_conversions_unittest.mm ('k') | net/net.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 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 'conditions': [ 10 'conditions': [
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 'libraries': [ 435 'libraries': [
436 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', 436 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
437 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk', 437 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk',
438 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 438 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
439 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 439 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
440 '$(SDKROOT)/usr/lib/libresolv.dylib', 440 '$(SDKROOT)/usr/lib/libresolv.dylib',
441 ], 441 ],
442 }, 442 },
443 }, 443 },
444 ], 444 ],
445 [ 'OS == "ios" or OS == "mac"', {
446 'sources': [
447 '<@(net_base_mac_ios_sources)',
448 ],
449 },
450 ],
445 ['OS=="android" and _toolset=="target" and android_webview_build == 0', { 451 ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
446 'dependencies': [ 452 'dependencies': [
447 'net_java', 453 'net_java',
448 ], 454 ],
449 }], 455 }],
450 [ 'OS == "android"', { 456 [ 'OS == "android"', {
451 'dependencies': [ 457 'dependencies': [
452 'net_jni_headers', 458 'net_jni_headers',
453 ], 459 ],
454 'sources!': [ 460 'sources!': [
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 545 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
540 'dependencies': [ 546 'dependencies': [
541 'epoll_server', 547 'epoll_server',
542 'flip_in_mem_edsm_server_base', 548 'flip_in_mem_edsm_server_base',
543 'quic_base', 549 'quic_base',
544 ], 550 ],
545 'sources': [ 551 'sources': [
546 '<@(net_linux_test_sources)', 552 '<@(net_linux_test_sources)',
547 ], 553 ],
548 }], 554 }],
555 ['OS == "mac" or OS == "ios"', {
556 'sources': [
557 '<@(net_base_test_mac_ios_sources)',
558 ],
559 }],
549 ['chromeos==1', { 560 ['chromeos==1', {
550 'sources!': [ 561 'sources!': [
551 'proxy/proxy_config_service_linux_unittest.cc', 562 'proxy/proxy_config_service_linux_unittest.cc',
552 ], 563 ],
553 }], 564 }],
554 [ 'OS == "android"', { 565 [ 'OS == "android"', {
555 'sources!': [ 566 'sources!': [
556 # See bug http://crbug.com/344533. 567 # See bug http://crbug.com/344533.
557 'disk_cache/blockfile/index_table_v3_unittest.cc', 568 'disk_cache/blockfile/index_table_v3_unittest.cc',
558 # No res_ninit() et al on Android, so this doesn't make a lot of 569 # No res_ninit() et al on Android, so this doesn't make a lot of
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 '../build/isolate.gypi', 1709 '../build/isolate.gypi',
1699 ], 1710 ],
1700 'sources': [ 1711 'sources': [
1701 'net_unittests.isolate', 1712 'net_unittests.isolate',
1702 ], 1713 ],
1703 }, 1714 },
1704 ], 1715 ],
1705 }], 1716 }],
1706 ], 1717 ],
1707 } 1718 }
OLDNEW
« no previous file with comments | « net/base/mac/url_conversions_unittest.mm ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698