diff options
| -rw-r--r-- | chrome/browser/sync/protocol/sync_proto.gyp | 6 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 14 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 6 | ||||
| -rw-r--r-- | net/net.gyp | 2 | ||||
| -rw-r--r-- | remoting/base/protocol/chromotocol.gyp | 12 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 4 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 6 | ||||
| -rw-r--r-- | third_party/safe_browsing/safe_browsing.gyp | 4 |
9 files changed, 28 insertions, 28 deletions
diff --git a/chrome/browser/sync/protocol/sync_proto.gyp b/chrome/browser/sync/protocol/sync_proto.gyp index 05be29f..9c3cf48 100644 --- a/chrome/browser/sync/protocol/sync_proto.gyp +++ b/chrome/browser/sync/protocol/sync_proto.gyp @@ -50,7 +50,7 @@ }, ], 'dependencies': [ - '../../../../third_party/protobuf2/protobuf.gyp:protoc#host', + '../../../../third_party/protobuf/protobuf.gyp:protoc#host', ], }, { @@ -59,13 +59,13 @@ 'export_dependent_settings': [ # TODO(akalin): Change back to protobuf_lite once it supports # preserving unknown fields. - '../../../../third_party/protobuf2/protobuf.gyp:protobuf', + '../../../../third_party/protobuf/protobuf.gyp:protobuf', 'sync_proto', ], 'dependencies': [ # TODO(akalin): Change back to protobuf_lite once it supports # preserving unknown fields. - '../../../../third_party/protobuf2/protobuf.gyp:protobuf', + '../../../../third_party/protobuf/protobuf.gyp:protobuf', 'sync_proto', ], 'direct_dependent_settings': { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7554cb7..8624a7b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1023,7 +1023,7 @@ 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', # TODO(akalin): Change back to protobuf_lite once it supports # preserving unknown fields. - '../third_party/protobuf2/protobuf.gyp:protobuf#target', + '../third_party/protobuf/protobuf.gyp:protobuf#target', ], 'conditions': [ ['OS=="win"', { 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', ], }, ], diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 3d072c0..d055052 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -334,8 +334,8 @@ }, ], 'dependencies': [ - '../third_party/protobuf2/protobuf.gyp:protobuf_lite', - '../third_party/protobuf2/protobuf.gyp:protoc#host', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../third_party/protobuf/protobuf.gyp:protoc#host', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -343,7 +343,7 @@ ] }, 'export_dependent_settings': [ - '../third_party/protobuf2/protobuf.gyp:protobuf_lite', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', ], }, ], diff --git a/net/net.gyp b/net/net.gyp index 36ea737..1ce4608 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1045,7 +1045,7 @@ ['inside_chromium_build==1', { 'dependencies': [ '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', - '../third_party/protobuf2/protobuf.gyp:py_proto', + '../third_party/protobuf/protobuf.gyp:py_proto', ], }], ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 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 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', ], }, ], |