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

Side by Side Diff: components/cronet/cronet_static.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 | « components/cronet/android/test/src/org/chromium/net/NativeTestServer.java ('k') | no next file » | 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 # This target is included into both 'cronet_static' and 'cronet_static_small'. 6 # This target is included into both 'cronet_static' and 'cronet_static_small'.
7 'type': 'static_library', 7 'type': 'static_library',
8 'dependencies': [ 8 'dependencies': [
9 '../base/base.gyp:base', 9 '../base/base.gyp:base',
10 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 10 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
11 'cronet_jni_headers', 11 'cronet_jni_headers',
12 'cronet_url_request_context_config_list', 12 'cronet_url_request_context_config_list',
13 'cronet_url_request_java', 13 'cronet_url_request_java',
14 'cronet_version', 14 'cronet_version',
15 'metrics', 15 'metrics',
16 ], 16 ],
17 'sources': [ 17 'sources': [
18 'android/chromium_url_request.cc', 18 'android/chromium_url_request.cc',
19 'android/chromium_url_request.h', 19 'android/chromium_url_request.h',
20 'android/chromium_url_request_context.cc', 20 'android/chromium_url_request_context.cc',
21 'android/chromium_url_request_context.h', 21 'android/chromium_url_request_context.h',
22 'android/chromium_url_request_error_list.h', 22 'android/chromium_url_request_error_list.h',
23 'android/chromium_url_request_priority_list.h', 23 'android/chromium_url_request_priority_list.h',
24 'android/cronet_data_reduction_proxy.cc',
25 'android/cronet_data_reduction_proxy.h',
26 'android/cronet_histogram_manager.cc', 24 'android/cronet_histogram_manager.cc',
27 'android/cronet_histogram_manager.h', 25 'android/cronet_histogram_manager.h',
28 'android/cronet_library_loader.cc', 26 'android/cronet_library_loader.cc',
29 'android/cronet_library_loader.h', 27 'android/cronet_library_loader.h',
30 'android/cronet_in_memory_pref_store.cc', 28 'android/cronet_in_memory_pref_store.cc',
31 'android/cronet_in_memory_pref_store.h', 29 'android/cronet_in_memory_pref_store.h',
32 'android/cronet_upload_data_stream_adapter.cc', 30 'android/cronet_upload_data_stream_adapter.cc',
33 'android/cronet_upload_data_stream_adapter.h', 31 'android/cronet_upload_data_stream_adapter.h',
34 'android/cronet_upload_data_stream_delegate.cc', 32 'android/cronet_upload_data_stream_delegate.cc',
35 'android/cronet_upload_data_stream_delegate.h', 33 'android/cronet_upload_data_stream_delegate.h',
(...skipping 22 matching lines...) Expand all
58 '-fvisibility-inlines-hidden', 56 '-fvisibility-inlines-hidden',
59 '-Wno-sign-promo', 57 '-Wno-sign-promo',
60 '-Wno-missing-field-initializers', 58 '-Wno-missing-field-initializers',
61 ], 59 ],
62 'ldflags': [ 60 'ldflags': [
63 '-llog', 61 '-llog',
64 '-landroid', 62 '-landroid',
65 '-Wl,--gc-sections', 63 '-Wl,--gc-sections',
66 '-Wl,--exclude-libs,ALL' 64 '-Wl,--exclude-libs,ALL'
67 ], 65 ],
66 'conditions': [
67 # If Data Reduction Proxy support is enabled, add the following
68 # defines and sources. Dependencies are target-specific and are
69 # not included here.
70 ['enable_data_reduction_proxy_support==1',
71 {
72 'defines' : [
73 'DATA_REDUCTION_PROXY_SUPPORT'
74 ],
75 'sources': [
76 'android/cronet_data_reduction_proxy.cc',
77 'android/cronet_data_reduction_proxy.h',
78 ],
79 }
80 ],
81 ],
68 } 82 }
OLDNEW
« no previous file with comments | « components/cronet/android/test/src/org/chromium/net/NativeTestServer.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698