'android/cert_verify_status_android_list.h',
'android/gurl_utils.cc',
'android/gurl_utils.h',
+ 'android/android_private_key.cc',
+ 'android/android_private_key.h',
'android/keystore.cc',
'android/keystore.h',
'android/keystore_openssl.cc',
'base/file_stream_net_log_parameters.cc',
'base/file_stream_net_log_parameters.h',
'base/file_stream_whence.h',
- 'base/filter.cc',
- 'base/filter.h',
'base/int128.cc',
'base/int128.h',
- 'base/gzip_filter.cc',
- 'base/gzip_filter.h',
- 'base/gzip_header.cc',
- 'base/gzip_header.h',
'base/hash_value.cc',
'base/hash_value.h',
'base/host_mapping_rules.cc',
'base/registry_controlled_domains/registry_controlled_domain.h',
'base/request_priority.cc',
'base/request_priority.h',
- 'base/sdch_filter.cc',
- 'base/sdch_filter.h',
'base/sdch_manager.cc',
'base/sdch_manager.h',
'base/static_cookie_policy.cc',
'disk_cache/v3/entry_impl_v3.h',
'disk_cache/v3/eviction_v3.cc',
'disk_cache/v3/eviction_v3.h',
+ 'disk_cache/v3/histogram_macros.h',
'disk_cache/v3/index_table.cc',
'disk_cache/v3/index_table.h',
'dns/address_sorter.h',
'dns/serial_worker.h',
'dns/single_request_host_resolver.cc',
'dns/single_request_host_resolver.h',
+ 'filter/filter.cc',
+ 'filter/filter.h',
+ 'filter/gzip_filter.cc',
+ 'filter/gzip_filter.h',
+ 'filter/gzip_header.cc',
+ 'filter/gzip_header.h',
+ 'filter/sdch_filter.cc',
+ 'filter/sdch_filter.h',
'ftp/ftp_auth_cache.cc',
'ftp/ftp_auth_cache.h',
'ftp/ftp_ctrl_response_buffer.cc',
'http/des.h',
'http/disk_cache_based_quic_server_info.cc',
'http/disk_cache_based_quic_server_info.h',
+ 'http/failing_http_transaction_factory.cc',
+ 'http/failing_http_transaction_factory.h',
'http/http_atom_list.h',
'http/http_auth.cc',
'http/http_auth.h',
'http/partial_data.h',
'http/proxy_client_socket.h',
'http/proxy_client_socket.cc',
- 'http/proxy_connect_redirect_http_stream.h',
'http/proxy_connect_redirect_http_stream.cc',
+ 'http/proxy_connect_redirect_http_stream.h',
'http/transport_security_persister.cc',
'http/transport_security_persister.h',
'http/transport_security_state.cc',
'quic/crypto/crypto_framer.h',
'quic/crypto/crypto_handshake.cc',
'quic/crypto/crypto_handshake.h',
+ 'quic/crypto/crypto_handshake_message.cc',
+ 'quic/crypto/crypto_handshake_message.h',
'quic/crypto/crypto_protocol.h',
'quic/crypto/crypto_secret_boxer.cc',
'quic/crypto/crypto_secret_boxer.h',
'spdy/buffered_spdy_framer.cc',
'spdy/buffered_spdy_framer.h',
'spdy/hpack_constants.h',
+ 'spdy/hpack_decoder.cc',
+ 'spdy/hpack_decoder.h',
'spdy/hpack_encoder.cc',
'spdy/hpack_encoder.h',
'spdy/hpack_encoding_context.cc',
'spdy/hpack_entry.h',
'spdy/hpack_header_table.cc',
'spdy/hpack_header_table.h',
+ 'spdy/hpack_input_stream.cc',
+ 'spdy/hpack_input_stream.h',
'spdy/hpack_output_stream.cc',
'spdy/hpack_output_stream.h',
'spdy/hpack_string_util.cc',
'../third_party/nss/nss.gyp:nss',
'third_party/nss/ssl.gyp:libssl',
],
+ 'sources!': [
+ 'disk_cache/file_posix.cc',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
['OS == "android"', {
'sources/': [
['include', '^base/platform_mime_util_linux\\.cc$'],
+ ['include', '^base/address_tracker_linux\\.cc$'],
+ ['include', '^base/address_tracker_linux\\.h$'],
],
}],
['OS == "ios"', {
'base/escape_unittest.cc',
'base/expiring_cache_unittest.cc',
'base/file_stream_unittest.cc',
- 'base/filter_unittest.cc',
'base/int128_unittest.cc',
- 'base/gzip_filter_unittest.cc',
'base/host_mapping_rules_unittest.cc',
'base/host_port_pair_unittest.cc',
'base/ip_endpoint_unittest.cc',
'base/keygen_handler_unittest.cc',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
- 'base/mock_filter_context.cc',
- 'base/mock_filter_context.h',
'base/net_log_logger_unittest.cc',
'base/net_log_unittest.cc',
'base/net_log_unittest.h',
'base/prioritized_dispatcher_unittest.cc',
'base/priority_queue_unittest.cc',
'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
- 'base/sdch_filter_unittest.cc',
'base/sdch_manager_unittest.cc',
'base/static_cookie_policy_unittest.cc',
'base/test_completion_callback_unittest.cc',
'dns/record_parsed_unittest.cc',
'dns/record_rdata_unittest.cc',
'dns/single_request_host_resolver_unittest.cc',
+ 'filter/filter_unittest.cc',
+ 'filter/gzip_filter_unittest.cc',
+ 'filter/mock_filter_context.cc',
+ 'filter/mock_filter_context.h',
+ 'filter/sdch_filter_unittest.cc',
'ftp/ftp_auth_cache_unittest.cc',
'ftp/ftp_ctrl_response_buffer_unittest.cc',
'ftp/ftp_directory_listing_parser_ls_unittest.cc',
'socket_stream/socket_stream_metrics_unittest.cc',
'socket_stream/socket_stream_unittest.cc',
'spdy/buffered_spdy_framer_unittest.cc',
+ 'spdy/hpack_decoder_test.cc',
'spdy/hpack_encoder_test.cc',
'spdy/hpack_encoding_context_test.cc',
'spdy/hpack_entry_test.cc',
'spdy/hpack_header_table_test.cc',
+ 'spdy/hpack_input_stream_test.cc',
'spdy/hpack_output_stream_test.cc',
'spdy/hpack_string_util_test.cc',
'spdy/mock_spdy_framer_visitor.cc',
}],
[ 'OS == "android"', {
'sources!': [
- # See bug 294367.
+ # See bug 344533.
'disk_cache/v3/index_table_unittest.cc',
# No res_ninit() et al on Android, so this doesn't make a lot of
# sense.
# implementation is missing or incomplete.
# KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
'base/keygen_handler_unittest.cc',
- # Need to read input data files.
- 'base/gzip_filter_unittest.cc',
'disk_cache/backend_unittest.cc',
'disk_cache/block_files_unittest.cc',
+ # Need to read input data files.
+ 'filter/gzip_filter_unittest.cc',
'socket/ssl_server_socket_unittest.cc',
# Need TestServer.
'proxy/proxy_script_fetcher_impl_unittest.cc',
# iOS.
# OS is not "linux" or "freebsd" or "openbsd".
'socket/unix_domain_socket_posix_unittest.cc',
+
+ # See bug 344533.
+ 'disk_cache/v3/index_table_unittest.cc',
],
}],
[ 'OS == "android"', {
]
}],
],
+ 'target_conditions': [
+ # These source files are excluded by default platform rules, but they
+ # are needed in specific cases on other platforms. Re-including them can
+ # only be done in target_conditions as it is evaluated after the
+ # platform rules.
+ ['OS == "android"', {
+ 'sources/': [
+ ['include', '^base/address_tracker_linux_unittest\\.cc$'],
+ ],
+ }],
+ ],
},
{
'target_name': 'net_perftests',
'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
'android/java/src/org/chromium/net/AndroidKeyStore.java',
'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
+ 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
'android/java/src/org/chromium/net/GURLUtils.java',
'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
'android/java/src/org/chromium/net/ProxyChangeListener.java',
'certificate_mime_types_java',
'net_errors_java',
'private_key_types_java',
+ 'remote_android_keystore_aidl',
],
'includes': [ '../build/java.gypi' ],
},
{
+ # Processes the interface files for communication with an Android KeyStore
+ # running in a separate process.
+ 'target_name': 'remote_android_keystore_aidl',
+ 'type': 'none',
+ 'variables': {
+ 'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl',
+ },
+ 'sources': [
+ '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl',
+ '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl',
+ ],
+ 'includes': [ '../build/java_aidl.gypi' ],
+ },
+ {
'target_name': 'net_java_test_support',
'type': 'none',
'variables': {
projects / platform / framework / web / crosswalk.git / blobdiff