diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 19:58:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 19:58:58 +0000 |
| commit | dfb1f492506c95cd41e03228d84466688ae95bad (patch) | |
| tree | b192e0ebdc35934c843a86ed56135c7d468a2ea9 /chrome/chrome_browser.gypi | |
| parent | 67daf5ce778364d5784cfe4628d6b9951487e805 (diff) | |
| download | chromium_src-dfb1f492506c95cd41e03228d84466688ae95bad.zip chromium_src-dfb1f492506c95cd41e03228d84466688ae95bad.tar.gz chromium_src-dfb1f492506c95cd41e03228d84466688ae95bad.tar.bz2 | |
Avoid building in_memory_url_index_cache.pb.o in two targets
This fixes a warning when building with ninja.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6765034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3055632..a94b6ab 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -17,7 +17,7 @@ 'common', 'common_net', 'debugger', - 'in_memory_url_index_cache_proto', + 'in_memory_url_index_cache_proto_cpp', 'installer_util', 'platform_locale_settings', 'profile_import', @@ -1100,7 +1100,6 @@ 'browser/history/in_memory_history_backend.h', 'browser/history/in_memory_url_index.cc', 'browser/history/in_memory_url_index.h', - '<(protoc_out_dir)/chrome/browser/history/in_memory_url_index_cache.pb.cc', 'browser/history/page_usage_data.cc', 'browser/history/page_usage_data.h', 'browser/history/query_parser.cc', @@ -4356,6 +4355,23 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', ], }, + { + 'target_name': 'in_memory_url_index_cache_proto_cpp', + 'type': '<(library)', + 'sources': [ + '<(protoc_out_dir)/chrome/browser/history/in_memory_url_index_cache.pb.cc', + '<(protoc_out_dir)/chrome/browser/history/in_memory_url_index_cache.pb.h', + ], + 'dependencies': [ + 'in_memory_url_index_cache_proto', + ], + 'export_dependent_settings': [ + 'in_memory_url_index_cache_proto', + ], + # This target exports a hard dependency because it includes generated + # header files. + 'hard_dependency': 1, + }, ], } |