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 /remoting | |
| 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 'remoting')
| -rw-r--r-- | remoting/base/protocol/chromotocol.gyp | 12 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/remoting/base/protocol/chromotocol.gyp b/remoting/base/protocol/chromotocol.gyp index f3167ad..fbcea21 100644 --- a/remoting/base/protocol/chromotocol.gyp +++ b/remoting/base/protocol/chromotocol.gyp @@ -38,7 +38,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. @@ -49,11 +49,11 @@ 'target_name': 'chromotocol_proto_lib', 'type': '<(library)', 'export_dependent_settings': [ - '../../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'chromotocol_proto', ], 'dependencies': [ - '../../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'chromotocol_proto', ], # This target exports a hard dependency because depedents require @@ -101,7 +101,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. @@ -112,11 +112,11 @@ 'target_name': 'trace_proto_lib', 'type': '<(library)', 'export_dependent_settings': [ - '../../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'trace_proto', ], 'dependencies': [ - '../../../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'trace_proto', ], # This target exports a hard dependency because depedents require diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index e64624b..7a87ce0 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -113,7 +113,7 @@ 'dependencies': [ '../gfx/gfx.gyp:gfx', '../media/media.gyp:media', - '../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/libvpx/libvpx.gyp:libvpx_include', '../third_party/zlib/zlib.gyp:zlib', 'base/protocol/chromotocol.gyp:chromotocol_proto_lib', @@ -121,7 +121,7 @@ 'chromoting_jingle_glue', ], 'export_dependent_settings': [ - '../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'base/protocol/chromotocol.gyp:chromotocol_proto_lib', ], # This target needs a hard dependency because dependent targets |