summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--chrome/chrome.gyp6
2 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 8a356eb..0e2e5bb 100644
--- a/DEPS
+++ b/DEPS
@@ -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)',