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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index e962ac0eebe59c75323346f215fbefae0806ddba..977aa27ee670605bae61b039f149ed616cb4364f 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -108,20 +108,36 @@
'DISABLE_FTP_SUPPORT=1',
],
'dependencies': [
- '../components/components.gyp:data_reduction_proxy_core_browser_small',
'../net/net.gyp:net_small',
],
'includes': [ 'cronet/cronet_static.gypi' ],
+ 'conditions': [
+ ['enable_data_reduction_proxy_support==1',
+ {
+ 'dependencies': [
+ '../components/components.gyp:data_reduction_proxy_core_browser_small',
+ ],
+ },
+ ],
+ ],
},
{
# cronet_static target depends on ICU and includes file and ftp support.
'target_name': 'cronet_static',
'dependencies': [
'../base/base.gyp:base_i18n',
- '../components/components.gyp:data_reduction_proxy_core_browser',
'../net/net.gyp:net',
],
'includes': [ 'cronet/cronet_static.gypi' ],
+ 'conditions': [
+ ['enable_data_reduction_proxy_support==1',
+ {
+ 'dependencies': [
+ '../components/components.gyp:data_reduction_proxy_core_browser',
+ ],
+ },
+ ],
+ ],
},
{
'target_name': 'libcronet',
@@ -303,6 +319,15 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
],
+ 'conditions' : [
+ ['enable_data_reduction_proxy_support==1',
+ {
+ 'defines' : [
+ 'DATA_REDUCTION_PROXY_SUPPORT'
+ ],
+ },
+ ],
+ ],
},
{
'target_name': 'cronet_test_apk',
@@ -473,6 +498,9 @@
],
},
],
+ 'variables': {
+ 'enable_data_reduction_proxy_support%': 0,
+ },
}], # OS=="android"
],
}
« 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