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 /third_party | |
| 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 'third_party')
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 6 | ||||
| -rw-r--r-- | third_party/safe_browsing/safe_browsing.gyp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 06cf253..5e0b074 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -51,7 +51,7 @@ }, ], 'dependencies': [ - '../../third_party/protobuf2/protobuf.gyp:protoc#host', + '../../third_party/protobuf/protobuf.gyp:protoc#host', ], # This target exports a hard dependency because it generates header # files. @@ -97,7 +97,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', - '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'cacheinvalidation_proto', ], # This target exports a hard dependency because depedents require @@ -111,7 +111,7 @@ ], }, 'export_dependent_settings': [ - '../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'cacheinvalidation_proto', ], }, diff --git a/third_party/safe_browsing/safe_browsing.gyp b/third_party/safe_browsing/safe_browsing.gyp index 819d5f3..f0ecda2 100644 --- a/third_party/safe_browsing/safe_browsing.gyp +++ b/third_party/safe_browsing/safe_browsing.gyp @@ -13,10 +13,10 @@ 'testing/testing_input.dat', ], 'export_dependent_settings': [ - '../protobuf2/protobuf.gyp:py_proto', + '../protobuf/protobuf.gyp:py_proto', ], 'dependencies': [ - '../protobuf2/protobuf.gyp:py_proto', + '../protobuf/protobuf.gyp:py_proto', ], }, ], |