diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:07:01 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:07:01 +0000 |
| commit | 9a17f6354a312b2425ff73dcbb8c1fd9cfbf4067 (patch) | |
| tree | feb217c6bf60ac6046676e9da8ea9d0edb0d5950 | |
| parent | 59e68c95c74850267e30dd8583fa9dad2a294c02 (diff) | |
| download | chromium_src-9a17f6354a312b2425ff73dcbb8c1fd9cfbf4067.zip chromium_src-9a17f6354a312b2425ff73dcbb8c1fd9cfbf4067.tar.gz chromium_src-9a17f6354a312b2425ff73dcbb8c1fd9cfbf4067.tar.bz2 | |
Finishes fixing adding protobuf dependency.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/149612
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20622 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -27,7 +27,7 @@ deps = { "src/third_party/icu38": "/trunk/deps/third_party/icu38@20192", - "src/third_party/protobuf/src": + "src/third_party/protobuf2/src": "http://protobuf.googlecode.com/svn/trunk@154", # TODO(mark): Remove once this has moved into depot_tools. diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 29802db..5a62435 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2108,8 +2108,8 @@ }], ['chromeos==1',{ 'dependencies': [ - '../third_party/protobuf/protobuf.gyp:protobuf', - '../third_party/protobuf/protobuf.gyp:protoc', + '../third_party/protobuf2/protobuf.gyp:protobuf', + '../third_party/protobuf2/protobuf.gyp:protoc', ], 'actions': [ { 'action_name': 'my_proto', @@ -2122,7 +2122,7 @@ '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h', ], 'dependencies': [ - '../third_party/protobuf/protobuf.gyp:protoc', + '../third_party/protobuf2/protobuf.gyp:protoc', ], 'action': [ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', |