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

Side by Side Diff: net/net_common.gypi

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « net/BUILD.gn ('k') | skia/skia_common.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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 # This target is included in both 'net' and 'net_small'. 6 # This target is included in both 'net' and 'net_small'.
7 'type': '<(component)', 7 'type': '<(component)',
8 'variables': { 'enable_wexit_time_destructors': 1, }, 8 'variables': { 'enable_wexit_time_destructors': 1, },
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 ], 359 ],
360 }, 360 },
361 }, 361 },
362 ], 362 ],
363 [ 'OS == "ios" or OS == "mac"', { 363 [ 'OS == "ios" or OS == "mac"', {
364 'sources': [ 364 'sources': [
365 '<@(net_base_mac_ios_sources)', 365 '<@(net_base_mac_ios_sources)',
366 ], 366 ],
367 }, 367 },
368 ], 368 ],
369 ['OS=="android" and _toolset=="target" and android_webview_build == 0', { 369 ['OS=="android" and _toolset=="target"', {
370 'dependencies': [ 370 'dependencies': [
371 'net_java', 371 'net_java',
372 ], 372 ],
373 }], 373 }],
374 [ 'OS == "android"', { 374 [ 'OS == "android"', {
375 'dependencies': [ 375 'dependencies': [
376 'net_jni_headers', 376 'net_jni_headers',
377 ], 377 ],
378 'sources!': [ 378 'sources!': [
379 'base/openssl_private_key_store_memory.cc', 379 'base/openssl_private_key_store_memory.cc',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 ['include', '^cert/x509_util_nss\\.cc$'], 416 ['include', '^cert/x509_util_nss\\.cc$'],
417 ['include', '^cert/x509_util_nss\\.h$'], 417 ['include', '^cert/x509_util_nss\\.h$'],
418 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 418 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
419 ['include', '^proxy/proxy_server_mac\\.cc$'], 419 ['include', '^proxy/proxy_server_mac\\.cc$'],
420 ['include', '^ocsp/nss_ocsp\\.cc$'], 420 ['include', '^ocsp/nss_ocsp\\.cc$'],
421 ['include', '^ocsp/nss_ocsp\\.h$'], 421 ['include', '^ocsp/nss_ocsp\\.h$'],
422 ], 422 ],
423 }], 423 }],
424 ], 424 ],
425 } 425 }
OLDNEW
« no previous file with comments | « net/BUILD.gn ('k') | skia/skia_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698