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

Side by Side Diff: net/net.gyp

Issue 7352014: Revert "Add COMPONENT_BUILD global define. " (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « net/base/ssl_false_start_blacklist.h ('k') | sandbox/sandbox.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 'base/winsock_init.h', 815 'base/winsock_init.h',
816 'base/winsock_util.cc', 816 'base/winsock_util.cc',
817 'base/winsock_util.h', 817 'base/winsock_util.h',
818 'proxy/proxy_resolver_winhttp.cc', 818 'proxy/proxy_resolver_winhttp.cc',
819 'proxy/proxy_resolver_winhttp.h', 819 'proxy/proxy_resolver_winhttp.h',
820 ], 820 ],
821 }, 821 },
822 ], 822 ],
823 [ 'component == "shared_library"', { 823 [ 'component == "shared_library"', {
824 'defines': [ 824 'defines': [
825 'NET_DLL',
825 'NET_IMPLEMENTATION', 826 'NET_IMPLEMENTATION',
826 ], 827 ],
828 'direct_dependent_settings': {
829 'defines': [
830 'NET_DLL',
831 ],
832 },
833 'conditions': [
834 [ 'OS == "win"', {
835 'msvs_disabled_warnings': [
836 # class 'std::xx' needs to have dll-interface.
837 4251,
838 ],
839 'direct_dependent_settings': {
840 'msvs_disabled_warnings': [
841 4251,
842 ],
843 },
844 }],
845 ],
827 }], 846 }],
828 [ 'OS == "mac"', { 847 [ 'OS == "mac"', {
829 'dependencies': [ 848 'dependencies': [
830 '../third_party/nss/nss.gyp:nspr', 849 '../third_party/nss/nss.gyp:nspr',
831 '../third_party/nss/nss.gyp:nss', 850 '../third_party/nss/nss.gyp:nss',
832 'third_party/nss/ssl.gyp:ssl', 851 'third_party/nss/ssl.gyp:ssl',
833 ], 852 ],
834 'link_settings': { 853 'link_settings': {
835 'libraries': [ 854 'libraries': [
836 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 855 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1475 'tools/dump_cache/url_to_filename_encoder.cc', 1494 'tools/dump_cache/url_to_filename_encoder.cc',
1476 'tools/dump_cache/url_to_filename_encoder.h', 1495 'tools/dump_cache/url_to_filename_encoder.h',
1477 'tools/dump_cache/url_utilities.h', 1496 'tools/dump_cache/url_utilities.h',
1478 'tools/dump_cache/url_utilities.cc', 1497 'tools/dump_cache/url_utilities.cc',
1479 ], 1498 ],
1480 }, 1499 },
1481 ], 1500 ],
1482 }], 1501 }],
1483 ], 1502 ],
1484 } 1503 }
OLDNEW
« no previous file with comments | « net/base/ssl_false_start_blacklist.h ('k') | sandbox/sandbox.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698