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

Side by Side Diff: net/net.gyp

Issue 1431723002: Add brotli content-encoding filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Exclude brotli_filter_unittest on ios - needs to read input data files Created 4 years, 11 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/http/http_network_session.cc ('k') | net/net.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 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 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ], 100 ],
101 'defines': [ 101 'defines': [
102 'NET_IMPLEMENTATION', 102 'NET_IMPLEMENTATION',
103 ], 103 ],
104 }, 104 },
105 { 105 {
106 # GN version: //net 106 # GN version: //net
107 'target_name': 'net', 107 'target_name': 'net',
108 'dependencies': [ 108 'dependencies': [
109 '../base/base.gyp:base_i18n', 109 '../base/base.gyp:base_i18n',
110 '../third_party/brotli/brotli.gyp:brotli',
110 '../third_party/icu/icu.gyp:icui18n', 111 '../third_party/icu/icu.gyp:icui18n',
111 '../third_party/icu/icu.gyp:icuuc', 112 '../third_party/icu/icu.gyp:icuuc',
112 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 113 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
113 '../url/url.gyp:url_lib', 114 '../url/url.gyp:url_lib',
114 'net_quic_proto', 115 'net_quic_proto',
115 ], 116 ],
116 'sources': [ 117 'sources': [
117 'base/filename_util_icu.cc', 118 'base/filename_util_icu.cc',
118 'base/net_string_util_icu.cc', 119 'base/net_string_util_icu.cc',
119 'base/net_util_icu.cc', 120 'base/net_util_icu.cc',
121 'filter/brotli_filter.cc',
120 ], 122 ],
121 'includes': [ 'net_common.gypi' ], 123 'includes': [ 'net_common.gypi' ],
122 }, 124 },
123 { 125 {
124 # GN version: //net:net_unittests 126 # GN version: //net:net_unittests
125 'target_name': 'net_unittests', 127 'target_name': 'net_unittests',
126 'type': '<(gtest_target_type)', 128 'type': '<(gtest_target_type)',
127 'dependencies': [ 129 'dependencies': [
128 '../base/base.gyp:base', 130 '../base/base.gyp:base',
129 '../base/base.gyp:base_i18n', 131 '../base/base.gyp:base_i18n',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 }, 379 },
378 ], 380 ],
379 'sources!': [ 381 'sources!': [
380 # TODO(droger): The following tests are disabled because the 382 # TODO(droger): The following tests are disabled because the
381 # implementation is missing or incomplete. 383 # implementation is missing or incomplete.
382 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS. 384 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
383 'base/keygen_handler_unittest.cc', 385 'base/keygen_handler_unittest.cc',
384 'disk_cache/backend_unittest.cc', 386 'disk_cache/backend_unittest.cc',
385 'disk_cache/blockfile/block_files_unittest.cc', 387 'disk_cache/blockfile/block_files_unittest.cc',
386 # Need to read input data files. 388 # Need to read input data files.
389 'filter/brotli_filter_unittest.cc',
387 'filter/gzip_filter_unittest.cc', 390 'filter/gzip_filter_unittest.cc',
388 # Need TestServer. 391 # Need TestServer.
389 "cert_net/cert_net_fetcher_impl_unittest.cc", 392 "cert_net/cert_net_fetcher_impl_unittest.cc",
390 'proxy/proxy_script_fetcher_impl_unittest.cc', 393 'proxy/proxy_script_fetcher_impl_unittest.cc',
391 'socket/ssl_client_socket_unittest.cc', 394 'socket/ssl_client_socket_unittest.cc',
392 'socket/ssl_server_socket_unittest.cc', 395 'socket/ssl_server_socket_unittest.cc',
393 'spdy/fuzzing/hpack_fuzz_util_test.cc', 396 'spdy/fuzzing/hpack_fuzz_util_test.cc',
394 # Needs GetAppOutput(). 397 # Needs GetAppOutput().
395 'test/python_utils_unittest.cc', 398 'test/python_utils_unittest.cc',
396 'url_request/url_fetcher_impl_unittest.cc', 399 'url_request/url_fetcher_impl_unittest.cc',
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 }, 1353 },
1351 'dependencies': [ 1354 'dependencies': [
1352 '../url/url.gyp:url_lib_use_icu_alternatives_on_android', 1355 '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
1353 ], 1356 ],
1354 'defines': [ 1357 'defines': [
1355 'USE_ICU_ALTERNATIVES_ON_ANDROID=1', 1358 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
1356 'DISABLE_FILE_SUPPORT=1', 1359 'DISABLE_FILE_SUPPORT=1',
1357 'DISABLE_FTP_SUPPORT=1', 1360 'DISABLE_FTP_SUPPORT=1',
1358 ], 1361 ],
1359 'sources': [ 1362 'sources': [
1363 'filter/brotli_filter_disabled.cc',
1360 'base/net_string_util_icu_alternatives_android.cc', 1364 'base/net_string_util_icu_alternatives_android.cc',
1361 'base/net_string_util_icu_alternatives_android.h', 1365 'base/net_string_util_icu_alternatives_android.h',
1362 ], 1366 ],
1363 'includes': [ 'net_common.gypi' ], 1367 'includes': [ 'net_common.gypi' ],
1364 }, 1368 },
1365 { 1369 {
1366 'target_name': 'net_jni_headers', 1370 'target_name': 'net_jni_headers',
1367 'type': 'none', 1371 'type': 'none',
1368 'sources': [ 1372 'sources': [
1369 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1373 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 '../build/isolate.gypi', 1702 '../build/isolate.gypi',
1699 ], 1703 ],
1700 'sources': [ 1704 'sources': [
1701 'net_unittests.isolate', 1705 'net_unittests.isolate',
1702 ], 1706 ],
1703 }, 1707 },
1704 ], 1708 ],
1705 }], 1709 }],
1706 ], 1710 ],
1707 } 1711 }
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698