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

Unified Diff: components/data_reduction_proxy.gypi

Issue 1017853003: Add ClientConfig proto, and JSON generation/parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak test values Created 5 years, 9 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 | « components/components_tests.gyp ('k') | components/data_reduction_proxy/core/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy.gypi
diff --git a/components/data_reduction_proxy.gypi b/components/data_reduction_proxy.gypi
index e387910fc6f75d6c6377cd88278eccfdf957fd8f..098c8a19dfca6dd4a72cff421a78713bffbaa19a 100644
--- a/components/data_reduction_proxy.gypi
+++ b/components/data_reduction_proxy.gypi
@@ -83,6 +83,7 @@
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
'data_reduction_proxy_core_common',
+ 'data_reduction_proxy_proto',
'pref_registry',
],
'include_dirs': [
@@ -95,6 +96,8 @@
'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.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',
@@ -130,6 +133,7 @@
'dependencies': [
'../base/base.gyp:base',
'../url/url.gyp:url_lib',
+ 'data_reduction_proxy_proto',
],
'include_dirs': [
'..',
@@ -137,6 +141,8 @@
'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_store.cc',
'data_reduction_proxy/core/common/data_reduction_proxy_event_store.h',
@@ -186,6 +192,24 @@
'msvs_disabled_warnings': [4267, ],
},
{
+ # GN version: //components/data_reduction_proxy/proto
+ 'target_name': 'data_reduction_proxy_proto',
+ 'type': 'static_library',
+ 'dependencies': [
+ ],
+ 'include_dirs': [
+ ],
+ 'sources': [
+ # Note: sources list duplicated in GN build.
+ 'data_reduction_proxy/proto/client_config.proto',
+ ],
+ 'variables': {
+ 'proto_in_dir': 'data_reduction_proxy/proto',
+ 'proto_out_dir': 'components/data_reduction_proxy/proto',
+ },
+ 'includes': [ '../build/protoc.gypi' ],
+ },
+ {
'target_name': 'data_reduction_proxy_version_header',
'type': 'none',
'direct_dependent_settings': {
« no previous file with comments | « components/components_tests.gyp ('k') | components/data_reduction_proxy/core/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698