diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:10:12 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:10:12 +0000 |
| commit | 10db3125659415a62d274e48b6e52508d3e4f5b3 (patch) | |
| tree | 27854828c8170e636b59c77cb9166eaffa6fa693 /components/variations.gypi | |
| parent | a0a4ff2eccfa5f7e3afb581773d19b0ed5bccd35 (diff) | |
| download | chromium_src-10db3125659415a62d274e48b6e52508d3e4f5b3.zip chromium_src-10db3125659415a62d274e48b6e52508d3e4f5b3.tar.gz chromium_src-10db3125659415a62d274e48b6e52508d3e4f5b3.tar.bz2 | |
Consolidate 'variations' and 'variations_seed_proto' targets.
Merges them to a single 'variations' target to simplify things.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/23604034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/variations.gypi')
| -rw-r--r-- | components/variations.gypi | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/components/variations.gypi b/components/variations.gypi index 8f3b6b2..a5b9c6e 100644 --- a/components/variations.gypi +++ b/components/variations.gypi @@ -13,11 +13,12 @@ 'dependencies': [ '../base/base.gyp:base', '../third_party/mt19937ar/mt19937ar.gyp:mt19937ar', - 'variations_seed_proto', ], 'sources': [ 'variations/entropy_provider.cc', 'variations/entropy_provider.h', + 'variations/proto/variations_seed.proto', + 'variations/proto/study.proto', 'variations/metrics_util.cc', 'variations/metrics_util.h', 'variations/variations_associated_data.cc', @@ -25,18 +26,6 @@ 'variations/variations_seed_processor.cc', 'variations/variations_seed_processor.h', ], - }, - { - # Protobuf compiler / generator for Chrome Variations seed. - 'target_name': 'variations_seed_proto', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - 'variations/proto/variations_seed.proto', - 'variations/proto/study.proto', - ], 'variables': { 'proto_in_dir': 'variations/proto', 'proto_out_dir': 'components/variations/proto', |