Add Data Saver support to Cronet

components/data_reduction_proxy.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.
 
 
 {
+  'variables' :
+  {
+     'data_reduction_proxy_core_browser_sources' : [
+        # Note: sources list duplicated in GN build.
+        "data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_service.h",
+        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_config.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_config.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_service.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_service.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_service_observer.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_settings.h',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc',
+        'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.h',
+     ],
+     'data_reduction_proxy_core_browser_deps' : [
+        'data_reduction_proxy_version_header',
+        '../base/base.gyp:base',
+        '../crypto/crypto.gyp:crypto',
+        'pref_registry',

[mmenke, 2015/05/07 20:22:19]

Hrm...pref_registry has a DEPS file that includes ui/base, which depends on
base_i18n, which cronet can not depend on.  Looks like that DEPS file isn't
actually needed, though.  Curious.

[bengr, 2015/05/08 22:41:03]

Acknowledged.

+     ],
+     'data_reduction_proxy_core_common_sources' : [
+        # Note: sources list duplicated in GN build.
+        'data_reduction_proxy/core/common/data_reduction_proxy_bypass_type_list.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_config_values.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_event_storage_delegate.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_event_store.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_headers.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_headers.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_params.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_params.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h',
+        'data_reduction_proxy/core/common/data_reduction_proxy_switches.cc',
+        'data_reduction_proxy/core/common/data_reduction_proxy_switches.h',
+     ],
+  },
+  'conditions': [
+    # Small versions of libraries for Cronet.
+    ['OS=="android"', {
+      'targets' : [
+       {
+         # GN version: //components/data_reduction_proxy/core/browser
+         'target_name': 'data_reduction_proxy_core_browser_small',
+         'type': 'static_library',
+         'dependencies': [
+           '<@(data_reduction_proxy_core_browser_deps)',
+           'data_reduction_proxy_core_common_small',

[mmenke, 2015/05/07 20:22:19]

You've included this one twice.

[bengr, 2015/05/08 22:41:03]

Done.

+           '../net/net.gyp:net_small',
+           '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+           'data_reduction_proxy_core_common_small',
+           'data_reduction_proxy_proto',
+           'pref_registry',

[mmenke, 2015/05/07 20:22:18]

data_reduction_proxy_proto and pref_registry are already in
"data_reduction_proxy_core_browser_deps".

[bengr, 2015/05/08 22:41:03]

drp_proto is needed here.

+         ],
+         'include_dirs': [
+           '..',
+         ],
+         'sources': [
+           '<@(data_reduction_proxy_core_browser_sources)'
+         ],
+       },
+       {
+         # GN version: //components/data_reduction_proxy/core/common
+         'target_name': 'data_reduction_proxy_core_common_small',
+         'type': 'static_library',
+         'dependencies': [
+           '../base/base.gyp:base',
+           '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+           'data_reduction_proxy_proto',
+         ],
+         'include_dirs': [
+           '..',
+         ],
+         'sources': [
+           '<@(data_reduction_proxy_core_common_sources)'
+         ],
+       },
+    ]}]
+  ],
   'targets': [
    {
       # GN Version: //components/data_reduction_proxy/content
       'target_name': 'data_reduction_proxy_content',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../content/content.gyp:content_browser',
         '../skia/skia.gyp:skia',
         '../ui/base/ui_base.gyp:ui_base',
@@ skipping 53 matching lines @@
       'target_name': 'data_reduction_proxy_core_browser',
       'type': 'static_library',
       'conditions': [
         ['OS != "android" and OS != "ios"', {
           'dependencies' : [
             '../google_apis/google_apis.gyp:google_apis',
           ]
         }],
       ],
       'dependencies': [
-        'data_reduction_proxy_version_header',
-        '../base/base.gyp:base',
-        '../crypto/crypto.gyp:crypto',
+        '<@(data_reduction_proxy_core_browser_deps)',
+        'data_reduction_proxy_core_common',

[mmenke, 2015/05/07 20:22:18]

Again, you have this twice.

[bengr, 2015/05/08 22:41:03]

Done.

         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'data_reduction_proxy_core_common',
         'data_reduction_proxy_proto',
         'pref_registry',

[mmenke, 2015/05/07 20:22:19]

data_reduction_proxy_proto and pref_registry are already in
"data_reduction_proxy_core_browser_deps".

[bengr, 2015/05/08 22:41:02]

drp_proto is needed here.

       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        "data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_service.h",
-        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_config.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_config.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_service.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_service.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_service_observer.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_settings.h',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc',
-        'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.h',
+        '<@(data_reduction_proxy_core_browser_sources)'
       ],
     },
     {
       # GN version: //components/data_reduction_proxy/core/common
       'target_name': 'data_reduction_proxy_core_common',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../url/url.gyp:url_lib',
         'data_reduction_proxy_proto',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        # Note: sources list duplicated in GN build.
-        'data_reduction_proxy/core/common/data_reduction_proxy_bypass_type_list.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_config_values.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_event_storage_delegate.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_event_store.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_headers.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_headers.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_params.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_params.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h',
-        'data_reduction_proxy/core/common/data_reduction_proxy_switches.cc',
-        'data_reduction_proxy/core/common/data_reduction_proxy_switches.h',
+        '<@(data_reduction_proxy_core_common_sources)'
       ],
     },
     {
       # GN version: //components/data_reduction_proxy/core/browser:test_support
       'target_name': 'data_reduction_proxy_test_support',
       'type': 'static_library',
       'dependencies' : [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
@@ skipping 71 matching lines @@
             '<@(_outputs)',
           ],
           'includes': [
             '../build/util/version.gypi',
           ],
         },
       ],
     },
   ],
 }