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

Side by Side Diff: net/net.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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 | « net/BUILD.gn ('k') | ppapi/BUILD.gn » ('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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 # Enables BidirectionalStream; Used in cronet, disabled by default. 9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0, 10 'enable_bidirectional_stream%': 0,
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 ], 215 ],
216 }, { # desktop_linux == 0 and chromeos == 0 216 }, { # desktop_linux == 0 and chromeos == 0
217 'dependencies': [ 217 'dependencies': [
218 '../third_party/nss/nss.gyp:nspr', 218 '../third_party/nss/nss.gyp:nspr',
219 '../third_party/nss/nss.gyp:nss', 219 '../third_party/nss/nss.gyp:nss',
220 'third_party/nss/ssl.gyp:libssl', 220 'third_party/nss/ssl.gyp:libssl',
221 ], 221 ],
222 }], 222 }],
223 ], 223 ],
224 }], 224 }],
225 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
226 'conditions': [
227 ['use_allocator!="none"', {
228 'dependencies': [
229 '../base/allocator/allocator.gyp:allocator',
230 ],
231 }],
232 ],
233 }],
234 [ 'use_kerberos==1', { 225 [ 'use_kerberos==1', {
235 'defines': [ 226 'defines': [
236 'USE_KERBEROS', 227 'USE_KERBEROS',
237 ], 228 ],
238 }], 229 }],
239 [ 'use_kerberos==0 or OS == "android"', { 230 [ 'use_kerberos==0 or OS == "android"', {
240 # These are excluded on Android, because the actual Kerberos support, 231 # These are excluded on Android, because the actual Kerberos support,
241 # which these test, is in a separate app on Android. 232 # which these test, is in a separate app on Android.
242 'sources!': [ 233 'sources!': [
243 'http/http_auth_gssapi_posix_unittest.cc', 234 'http/http_auth_gssapi_posix_unittest.cc',
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 ], 632 ],
642 }, { # desktop_linux == 0 and chromeos == 0 633 }, { # desktop_linux == 0 and chromeos == 0
643 'dependencies': [ 634 'dependencies': [
644 '../third_party/nss/nss.gyp:nspr', 635 '../third_party/nss/nss.gyp:nspr',
645 '../third_party/nss/nss.gyp:nss', 636 '../third_party/nss/nss.gyp:nss',
646 'third_party/nss/ssl.gyp:libssl', 637 'third_party/nss/ssl.gyp:libssl',
647 ], 638 ],
648 }], 639 }],
649 ], 640 ],
650 }], 641 }],
651 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
652 'conditions': [
653 ['use_allocator!="none"', {
654 'dependencies': [
655 '../base/allocator/allocator.gyp:allocator',
656 ],
657 }],
658 ],
659 }],
660 ['OS == "android"', { 642 ['OS == "android"', {
661 'dependencies': [ 643 'dependencies': [
662 'net_test_jni_headers', 644 'net_test_jni_headers',
663 ], 645 ],
664 'sources': [ 646 'sources': [
665 'test/embedded_test_server/android/embedded_test_server_android.cc', 647 'test/embedded_test_server/android/embedded_test_server_android.cc',
666 'test/embedded_test_server/android/embedded_test_server_android.h', 648 'test/embedded_test_server/android/embedded_test_server_android.h',
667 'test/spawned_test_server/remote_test_server.cc', 649 'test/spawned_test_server/remote_test_server.cc',
668 'test/spawned_test_server/remote_test_server.h', 650 'test/spawned_test_server/remote_test_server.h',
669 'test/spawned_test_server/spawner_communicator.cc', 651 'test/spawned_test_server/spawner_communicator.cc',
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 '../build/isolate.gypi', 1701 '../build/isolate.gypi',
1720 ], 1702 ],
1721 'sources': [ 1703 'sources': [
1722 'net_unittests.isolate', 1704 'net_unittests.isolate',
1723 ], 1705 ],
1724 }, 1706 },
1725 ], 1707 ],
1726 }], 1708 }],
1727 ], 1709 ],
1728 } 1710 }
OLDNEW
« no previous file with comments | « net/BUILD.gn ('k') | ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698