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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 10834051: Bringing up the net target on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Applying wtc's feedback. Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 7116b5a07c17df0eaa6b6f2cba3cf837b327d015..86f66ab35d5b079c64efee96551b2477bc14747e 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1031,32 +1031,6 @@
},
},
],
- [ 'OS == "android"', {
- 'defines': [
- # Android can shut down our app at any time, so we persist session cookies.
- 'ENABLE_PERSISTENT_SESSION_COOKIES'
- ],
- 'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
- 'net_jni_headers',
- ],
- 'sources!': [
- 'base/openssl_memory_private_key_store.cc',
- ],
- }, { # else OS! = "android"
- 'defines': [
- # These are the features Android doesn't support.
- 'ENABLE_MEDIA_CODEC_THEORA',
- ],
- },
- ],
- [ 'OS == "linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:dbus',
- '../dbus/dbus.gyp:dbus',
- ],
- },
- ],
[ 'OS == "ios"', {
'link_settings': {
'libraries': [
@@ -1092,6 +1066,32 @@
],
},
],
+ [ 'OS == "android"', {
+ 'defines': [
+ # Android can shut down our app at any time, so we persist session cookies.
+ 'ENABLE_PERSISTENT_SESSION_COOKIES'
+ ],
+ 'dependencies': [
+ '../third_party/openssl/openssl.gyp:openssl',
+ 'net_jni_headers',
+ ],
+ 'sources!': [
+ 'base/openssl_memory_private_key_store.cc',
+ ],
+ }, { # else OS! = "android"
+ 'defines': [
+ # These are the features Android doesn't support.
+ 'ENABLE_MEDIA_CODEC_THEORA',
+ ],
+ },
+ ],
+ [ 'OS == "linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../dbus/dbus.gyp:dbus',
+ ],
+ },
+ ],
],
'target_conditions': [
# These source files are excluded by default platform rules, but they
@@ -1448,6 +1448,28 @@
],
},
],
+ ['OS == "ios"', {
+ # TODO: For now this only tests the subset of code that is enabled in
+ # the net target.
+ 'dependencies': [
+ '../testing/gtest.gyp:gtest_main',
+ ],
+ 'dependencies!': [
+ 'net_test_support',
+ ],
+ 'sources/': [
+ ['exclude', '.*'],
+ ['include', '^base/dns_util_unittest\\.cc$'],
+ ['include', '^base/escape_unittest\\.cc$'],
+ ['include', '^base/ip_endpoint_unittest\\.cc$'],
+ ['include', '^base/mime_util_unittest\\.cc$'],
+ ['include', '^base/net_log_unittest\\.cc$'],
+ ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
+ ['include', '^http/http_byte_range_unittest\\.cc$'],
+ ['include', '^http/http_content_disposition_unittest\\.cc$'],
+ ['include', '^http/http_util_unittest\\.cc$'],
+ ],
+ }],
[ 'OS == "linux"', {
'dependencies': [
'../build/linux/system.gyp:dbus',
@@ -1478,28 +1500,6 @@
'base/x509_cert_types_unittest.cc',
],
}],
- ['OS == "ios"', {
- # TODO: For now this only tests the subset of code that is enabled in
- # the net target.
- 'dependencies': [
- '../testing/gtest.gyp:gtest_main',
- ],
- 'dependencies!': [
- 'net_test_support',
- ],
- 'sources/': [
- ['exclude', '.*'],
- ['include', '^base/dns_util_unittest\\.cc$'],
- ['include', '^base/escape_unittest\\.cc$'],
- ['include', '^base/ip_endpoint_unittest\\.cc$'],
- ['include', '^base/mime_util_unittest\\.cc$'],
- ['include', '^base/net_log_unittest\\.cc$'],
- ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
- ['include', '^http/http_byte_range_unittest\\.cc$'],
- ['include', '^http/http_content_disposition_unittest\\.cc$'],
- ['include', '^http/http_util_unittest\\.cc$'],
- ],
- }],
],
},
{
@@ -1693,147 +1693,147 @@
# iOS doesn't have the concept of simple executables, these targets
# can't be compiled on the platform.
{
- 'target_name': 'dnssec_chain_verify',
+ 'target_name': 'crash_cache',
'type': 'executable',
'dependencies': [
'net',
+ 'net_test_support',
'../base/base.gyp:base',
],
'sources': [
- 'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
+ 'tools/crash_cache/crash_cache.cc',
],
},
{
- 'target_name': 'fetch_server',
+ 'target_name': 'crl_set_dump',
'type': 'executable',
- 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'net',
'../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
],
'sources': [
- 'tools/fetch/fetch_server.cc',
- 'tools/fetch/http_listen_socket.cc',
- 'tools/fetch/http_listen_socket.h',
- 'tools/fetch/http_server.cc',
- 'tools/fetch/http_server.h',
- 'tools/fetch/http_server_request_info.cc',
- 'tools/fetch/http_server_request_info.h',
- 'tools/fetch/http_server_response_info.cc',
- 'tools/fetch/http_server_response_info.h',
- 'tools/fetch/http_session.cc',
- 'tools/fetch/http_session.h',
+ 'tools/crl_set_dump/crl_set_dump.cc',
],
},
{
- 'target_name': 'gdig',
+ 'target_name': 'dns_fuzz_stub',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:base',
'net',
+ '../base/base.gyp:base',
],
'sources': [
- 'tools/gdig/file_net_log.cc',
- 'tools/gdig/gdig.cc',
+ 'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
],
},
{
- 'target_name': 'net_watcher',
+ 'target_name': 'dnssec_chain_verify',
'type': 'executable',
'dependencies': [
'net',
'../base/base.gyp:base',
],
'sources': [
- 'tools/net_watcher/net_watcher.cc',
+ 'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
],
},
{
- 'target_name': 'crl_set_dump',
+ 'target_name': 'fetch_client',
'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'net',
'../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../testing/gtest.gyp:gtest',
],
'sources': [
- 'tools/crl_set_dump/crl_set_dump.cc',
+ 'tools/fetch/fetch_client.cc',
],
},
{
- 'target_name': 'tld_cleanup',
+ 'target_name': 'fetch_server',
'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ 'net',
'../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
],
'sources': [
- 'tools/tld_cleanup/tld_cleanup.cc',
+ 'tools/fetch/fetch_server.cc',
+ 'tools/fetch/http_listen_socket.cc',
+ 'tools/fetch/http_listen_socket.h',
+ 'tools/fetch/http_server.cc',
+ 'tools/fetch/http_server.h',
+ 'tools/fetch/http_server_request_info.cc',
+ 'tools/fetch/http_server_request_info.h',
+ 'tools/fetch/http_server_response_info.cc',
+ 'tools/fetch/http_server_response_info.h',
+ 'tools/fetch/http_session.cc',
+ 'tools/fetch/http_session.h',
],
},
{
- 'target_name': 'dns_fuzz_stub',
+ 'target_name': 'gdig',
'type': 'executable',
'dependencies': [
- 'net',
'../base/base.gyp:base',
+ 'net',
],
'sources': [
- 'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
+ 'tools/gdig/file_net_log.cc',
+ 'tools/gdig/gdig.cc',
],
},
{
- 'target_name': 'stress_cache',
+ 'target_name': 'net_watcher',
'type': 'executable',
'dependencies': [
'net',
- 'net_test_support',
'../base/base.gyp:base',
],
'sources': [
- 'disk_cache/stress_cache.cc',
+ 'tools/net_watcher/net_watcher.cc',
],
},
{
- 'target_name': 'crash_cache',
+ 'target_name': 'run_testserver',
'type': 'executable',
'dependencies': [
'net',
'net_test_support',
'../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../testing/gtest.gyp:gtest',
],
'sources': [
- 'tools/crash_cache/crash_cache.cc',
+ 'tools/testserver/run_testserver.cc',
],
},
{
- 'target_name': 'run_testserver',
+ 'target_name': 'stress_cache',
'type': 'executable',
'dependencies': [
'net',
'net_test_support',
'../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../testing/gtest.gyp:gtest',
],
'sources': [
- 'tools/testserver/run_testserver.cc',
+ 'disk_cache/stress_cache.cc',
],
},
{
- 'target_name': 'fetch_client',
+ 'target_name': 'tld_cleanup',
'type': 'executable',
- 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
- 'net',
'../base/base.gyp:base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
- '../testing/gtest.gyp:gtest',
],
'sources': [
- 'tools/fetch/fetch_client.cc',
+ 'tools/tld_cleanup/tld_cleanup.cc',
],
},
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698