diff options
| author | droger <droger@chromium.org> | 2015-03-05 11:45:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-05 19:46:09 +0000 |
| commit | f83b9126a7b0cc8955a5964e7ef27a5b7ebf8e10 (patch) | |
| tree | ab2a95aef70729cde2807c6e73062a0c58e850e0 /net/net.gyp | |
| parent | 1f34d906bc3e0f2ae043d9b23f1887da46639d20 (diff) | |
| download | chromium_src-f83b9126a7b0cc8955a5964e7ef27a5b7ebf8e10.zip chromium_src-f83b9126a7b0cc8955a5964e7ef27a5b7ebf8e10.tar.gz chromium_src-f83b9126a7b0cc8955a5964e7ef27a5b7ebf8e10.tar.bz2 | |
[iOS] Upstream ios/chrome/browser code
This CL upstreams several iOS source files.
It also fixes net.gyp so that url_conversions are compiled and
tested on iOS.
Review URL: https://codereview.chromium.org/979073002
Cr-Commit-Position: refs/heads/master@{#319305}
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/net/net.gyp b/net/net.gyp index 2677239..2d75cc5 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -498,6 +498,8 @@ }], ['OS == "ios"', { 'sources/': [ + ['include', '^base/mac/url_conversions\\.h$'], + ['include', '^base/mac/url_conversions\\.mm$'], ['include', '^base/net_util_mac\\.cc$'], ['include', '^base/net_util_mac\\.h$'], ['include', '^base/network_change_notifier_mac\\.cc$'], @@ -835,6 +837,11 @@ ['include', '^base/address_tracker_linux_unittest\\.cc$'], ], }], + ['OS == "ios"', { + 'sources/': [ + ['include', '^base/mac/url_conversions_unittest\\.mm$'], + ], + }], ], }, { @@ -1194,28 +1201,28 @@ 'target_name': 'quic_tools', 'type': 'static_library', 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../url/url.gyp:url_lib', - 'net', + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../url/url.gyp:url_lib', + 'net', ], 'sources': [ - 'quic/quic_dispatcher.cc', - 'quic/quic_dispatcher.h', - 'quic/quic_in_memory_cache.cc', - 'quic/quic_in_memory_cache.h', - 'quic/quic_per_connection_packet_writer.cc', - 'quic/quic_per_connection_packet_writer.h', - 'quic/quic_server.cc', - 'quic/quic_server.h', - 'quic/quic_server_packet_writer.cc', - 'quic/quic_server_packet_writer.h', - 'quic/quic_server_session.cc', - 'quic/quic_server_session.h', - 'quic/quic_spdy_server_stream.cc', - 'quic/quic_spdy_server_stream.h', - 'quic/quic_time_wait_list_manager.cc', - 'quic/quic_time_wait_list_manager.h', + 'quic/quic_dispatcher.cc', + 'quic/quic_dispatcher.h', + 'quic/quic_in_memory_cache.cc', + 'quic/quic_in_memory_cache.h', + 'quic/quic_per_connection_packet_writer.cc', + 'quic/quic_per_connection_packet_writer.h', + 'quic/quic_server.cc', + 'quic/quic_server.h', + 'quic/quic_server_packet_writer.cc', + 'quic/quic_server_packet_writer.h', + 'quic/quic_server_session.cc', + 'quic/quic_server_session.h', + 'quic/quic_spdy_server_stream.cc', + 'quic/quic_spdy_server_stream.h', + 'quic/quic_time_wait_list_manager.cc', + 'quic/quic_time_wait_list_manager.h', ], }, ], |