diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 16:35:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 16:35:12 +0000 |
| commit | 9cac94e630efc92e3fe955a962da7775ee1b9d70 (patch) | |
| tree | 7c384cdf153b5da15dea95171d4b419086f90506 /chrome/chrome_browser.gypi | |
| parent | 606334078cffc3385560da493c7882a3e849bc86 (diff) | |
| download | chromium_src-9cac94e630efc92e3fe955a962da7775ee1b9d70.zip chromium_src-9cac94e630efc92e3fe955a962da7775ee1b9d70.tar.gz chromium_src-9cac94e630efc92e3fe955a962da7775ee1b9d70.tar.bz2 | |
protobuf: switch to using third_party/protobuf
This change lights up new code, but the code should be identical to
the code in protobuf2, so no functional changes are expected.
BUG=56579
TEST=sync_unit_tests
http://codereview.chromium.org/3598004/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c5a1f11..a7c1fd4 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3918,9 +3918,9 @@ ['exclude', '^browser/notifications/balloon_collection_linux.cc'], ], 'dependencies': [ - '../third_party/protobuf2/protobuf.gyp:protobuf_lite', - #'../third_party/protobuf2/protobuf.gyp:protobuf', - '../third_party/protobuf2/protobuf.gyp:protoc#host', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + #'../third_party/protobuf/protobuf.gyp:protobuf', + '../third_party/protobuf/protobuf.gyp:protoc#host', ], 'conditions': [ ['system_libcros==0', { @@ -3951,7 +3951,7 @@ '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h', ], 'dependencies': [ - '../third_party/protobuf2/protobuf.gyp:protoc', + '../third_party/protobuf/protobuf.gyp:protoc', ], 'action': [ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', @@ -4088,8 +4088,8 @@ }, ], 'dependencies': [ - '../third_party/protobuf2/protobuf.gyp:protobuf', - '../third_party/protobuf2/protobuf.gyp:protoc#host', + '../third_party/protobuf/protobuf.gyp:protobuf', + '../third_party/protobuf/protobuf.gyp:protoc#host', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -4097,7 +4097,7 @@ ] }, 'export_dependent_settings': [ - '../third_party/protobuf2/protobuf.gyp:protobuf', + '../third_party/protobuf/protobuf.gyp:protobuf', ], }, ], |