Put Data Reduction Proxy support in Cronet behind a gyp flag

components/cronet.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['OS=="android"', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 90 matching lines @@
         {
           # cronet_static_small target has reduced binary size through using
           # ICU alternatives which requires file and ftp support be disabled.
           'target_name': 'cronet_static_small',
           'defines': [
             'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
             'DISABLE_FILE_SUPPORT=1',
             'DISABLE_FTP_SUPPORT=1',
           ],
           'dependencies': [
-            '../components/components.gyp:data_reduction_proxy_core_browser_small',
             '../net/net.gyp:net_small',
           ],
           'includes': [ 'cronet/cronet_static.gypi' ],
+          'variables': {
+            'enable_data_reduction_proxy_support%' : 0,
+          },
+          'conditions': [
+            # If Data Reduction Proxy support is enabled, add the following
+            # defines, sources, and dependencies.
+            ['enable_data_reduction_proxy_support==1',
+              {
+                'defines' : [
+                  'DATA_REDUCTION_PROXY_SUPPORT'

[mef, 2015/05/13 18:21:24]

would it make sense to have =1?

[bengr, 2015/05/15 00:54:55]

I considered that, but didn't see an advantage.

+                ],
+                'sources': [
+                  'cronet/android/cronet_data_reduction_proxy.cc',
+                  'cronet/android/cronet_data_reduction_proxy.h',
+                ],
+                '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' ],
+          'variables': {

[mef, 2015/05/13 18:21:24]

should this whole section (except dependencies) go into 'cronet_static.gypi'?

[bengr, 2015/05/15 00:54:55]

Done.

+            'enable_data_reduction_proxy_support%' : 0,
+          },
+          'conditions': [
+            # If Data Reduction Proxy support is enabled, add the following
+            # defines, sources, and dependencies.
+            ['enable_data_reduction_proxy_support==1',
+              {
+                'defines' : [
+                  'DATA_REDUCTION_PROXY_SUPPORT'
+                ],
+                'sources': [
+                  'cronet/android/cronet_data_reduction_proxy.cc',
+                  'cronet/android/cronet_data_reduction_proxy.h',
+                ],
+                'dependencies': [
+                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                ]
+              }
+            ],
+          ],
         },
         {
           'target_name': 'libcronet',
           'type': 'shared_library',
           'sources': [
             'cronet/android/cronet_jni.cc',
           ],
           'dependencies': [
             'cronet_static_small',
             '../base/base.gyp:base',
@@ skipping 351 matching lines @@
               'files': [
                 '<(SHARED_LIB_DIR)/<(native_lib)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="android"
   ],
 }