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

Side by Side Diff: components/cronet.gypi

Issue 1112513003: Put Data Reduction Proxy support in Cronet behind a gyp flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cronet
Patch Set: Addressed comments Created 5 years, 7 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 | « no previous file | components/cronet/android/cronet_url_request_context_adapter.h » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 # TODO(mef): Figure out what needs to be done for gn script. 8 # TODO(mef): Figure out what needs to be done for gn script.
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 { 101 {
102 # cronet_static_small target has reduced binary size through using 102 # cronet_static_small target has reduced binary size through using
103 # ICU alternatives which requires file and ftp support be disabled. 103 # ICU alternatives which requires file and ftp support be disabled.
104 'target_name': 'cronet_static_small', 104 'target_name': 'cronet_static_small',
105 'defines': [ 105 'defines': [
106 'USE_ICU_ALTERNATIVES_ON_ANDROID=1', 106 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
107 'DISABLE_FILE_SUPPORT=1', 107 'DISABLE_FILE_SUPPORT=1',
108 'DISABLE_FTP_SUPPORT=1', 108 'DISABLE_FTP_SUPPORT=1',
109 ], 109 ],
110 'dependencies': [ 110 'dependencies': [
111 '../components/components.gyp:data_reduction_proxy_core_browser_smal l',
112 '../net/net.gyp:net_small', 111 '../net/net.gyp:net_small',
113 ], 112 ],
114 'includes': [ 'cronet/cronet_static.gypi' ], 113 'includes': [ 'cronet/cronet_static.gypi' ],
114 'conditions': [
115 ['enable_data_reduction_proxy_support==1',
116 {
117 'dependencies': [
118 '../components/components.gyp:data_reduction_proxy_core_browse r_small',
119 ],
120 },
121 ],
122 ],
115 }, 123 },
116 { 124 {
117 # cronet_static target depends on ICU and includes file and ftp suppor t. 125 # cronet_static target depends on ICU and includes file and ftp suppor t.
118 'target_name': 'cronet_static', 126 'target_name': 'cronet_static',
119 'dependencies': [ 127 'dependencies': [
120 '../base/base.gyp:base_i18n', 128 '../base/base.gyp:base_i18n',
121 '../components/components.gyp:data_reduction_proxy_core_browser',
122 '../net/net.gyp:net', 129 '../net/net.gyp:net',
123 ], 130 ],
124 'includes': [ 'cronet/cronet_static.gypi' ], 131 'includes': [ 'cronet/cronet_static.gypi' ],
132 'conditions': [
133 ['enable_data_reduction_proxy_support==1',
134 {
135 'dependencies': [
136 '../components/components.gyp:data_reduction_proxy_core_browse r',
137 ],
138 },
139 ],
140 ],
125 }, 141 },
126 { 142 {
127 'target_name': 'libcronet', 143 'target_name': 'libcronet',
128 'type': 'shared_library', 144 'type': 'shared_library',
129 'sources': [ 145 'sources': [
130 'cronet/android/cronet_jni.cc', 146 'cronet/android/cronet_jni.cc',
131 ], 147 ],
132 'dependencies': [ 148 'dependencies': [
133 'cronet_static_small', 149 'cronet_static_small',
134 '../base/base.gyp:base', 150 '../base/base.gyp:base',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 '../base/base.gyp:base', 312 '../base/base.gyp:base',
297 '../net/net.gyp:net', 313 '../net/net.gyp:net',
298 '../net/net.gyp:net_quic_proto', 314 '../net/net.gyp:net_quic_proto',
299 '../net/net.gyp:net_test_support', 315 '../net/net.gyp:net_test_support',
300 '../net/net.gyp:simple_quic_tools', 316 '../net/net.gyp:simple_quic_tools',
301 '../url/url.gyp:url_lib', 317 '../url/url.gyp:url_lib',
302 '../base/base.gyp:base_i18n', 318 '../base/base.gyp:base_i18n',
303 '../third_party/icu/icu.gyp:icui18n', 319 '../third_party/icu/icu.gyp:icui18n',
304 '../third_party/icu/icu.gyp:icuuc', 320 '../third_party/icu/icu.gyp:icuuc',
305 ], 321 ],
322 'conditions' : [
323 ['enable_data_reduction_proxy_support==1',
324 {
325 'defines' : [
326 'DATA_REDUCTION_PROXY_SUPPORT'
327 ],
328 },
329 ],
330 ],
306 }, 331 },
307 { 332 {
308 'target_name': 'cronet_test_apk', 333 'target_name': 'cronet_test_apk',
309 'type': 'none', 334 'type': 'none',
310 'dependencies': [ 335 'dependencies': [
311 'cronet_java', 336 'cronet_java',
312 '../net/net.gyp:net_java_test_support', 337 '../net/net.gyp:net_java_test_support',
313 ], 338 ],
314 'variables': { 339 'variables': {
315 'apk_name': 'CronetTest', 340 'apk_name': 'CronetTest',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 }, 491 },
467 { 492 {
468 'destination': '<(package_dir)/symbols/<(android_app_abi)', 493 'destination': '<(package_dir)/symbols/<(android_app_abi)',
469 'files': [ 494 'files': [
470 '<(SHARED_LIB_DIR)/<(native_lib)', 495 '<(SHARED_LIB_DIR)/<(native_lib)',
471 ], 496 ],
472 }, 497 },
473 ], 498 ],
474 }, 499 },
475 ], 500 ],
501 'variables': {
502 'enable_data_reduction_proxy_support%': 0,
503 },
476 }], # OS=="android" 504 }], # OS=="android"
477 ], 505 ],
478 } 506 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet/android/cronet_url_request_context_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698