diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 23:47:04 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 23:47:04 +0000 |
| commit | 601e664f992c48f8a4009cc2d8843075a5e29192 (patch) | |
| tree | a5718fce0c31311e98c9bd48e46d3e132b2f4089 /third_party/cacheinvalidation | |
| parent | 376703e057fb55805c0d05c68a4b4d496e713ba7 (diff) | |
| download | chromium_src-601e664f992c48f8a4009cc2d8843075a5e29192.zip chromium_src-601e664f992c48f8a4009cc2d8843075a5e29192.tar.gz chromium_src-601e664f992c48f8a4009cc2d8843075a5e29192.tar.bz2 | |
Fixed cacheinvalidation.gyp so dependents compile properly and consistently.
BUG=34647
TEST=made sure http://codereview.chromium.org/2827014/show compiles.
Review URL: http://codereview.chromium.org/2813027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/cacheinvalidation')
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index f429bda..5e9347a 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -53,31 +53,9 @@ 'dependencies': [ '../../third_party/protobuf2/protobuf.gyp:protoc#host', ], - }, - # The library created from the generated c++ cacheinvalidation proto - # files. - { - 'target_name': 'cacheinvalidation_proto_cc', - 'type': '<(library)', - 'sources': [ - '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.h', - '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.cc', - ], - 'include_dirs': [ - '<(protoc_out_dir)', - ], - 'dependencies': [ - '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', - 'cacheinvalidation_proto', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(protoc_out_dir)', - ], - }, - 'export_dependent_settings': [ - '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', - ], + # This target exports a hard dependency because it generates header + # files. + 'hard_dependency': 1, }, # The main cache invalidation library. External clients should depend # only on this. @@ -85,6 +63,8 @@ 'target_name': 'cacheinvalidation', 'type': '<(library)', 'sources': [ + '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.h', + '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.cc', 'overrides/google/cacheinvalidation/callback.h', 'overrides/google/cacheinvalidation/compiler-specific.h', 'overrides/google/cacheinvalidation/googletest.h', @@ -108,23 +88,28 @@ 'files/src/google/cacheinvalidation/throttle.h', ], 'include_dirs': [ + '<(protoc_out_dir)', './overrides', './files/src', ], 'dependencies': [ '../../base/base.gyp:base', + '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', 'cacheinvalidation_proto', - 'cacheinvalidation_proto_cc', ], + # This target exports a hard dependency because depedents require + # cacheinvalidation_proto to compile. + 'hard_dependency': 1, 'direct_dependent_settings': { 'include_dirs': [ + '<(protoc_out_dir)', './overrides', './files/src', ], }, 'export_dependent_settings': [ + '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', 'cacheinvalidation_proto', - 'cacheinvalidation_proto_cc', ], }, # Unittests for the cache invalidation library. |