Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Unified Diff: third_party/cacheinvalidation/cacheinvalidation.gyp

Issue 1747018: Added cacheinvalidation.gyp to build/all.gyp. (Closed)
Patch Set: Fixed compile errors Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/cacheinvalidation/cacheinvalidation.gyp
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index adbda72fab07bb50979d997fd5706a7d7ae3409c..b0700f2ca158bece28d90f26612e1289d4bde524 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -2,6 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# TODO(akalin): Make it so that warnings are errors on Windows.
+# TODO(akalin): Clean up warnings on Windows.
+
{
'variables': {
# The root directory for the proto files.
@@ -39,7 +42,9 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
'--proto_path=<(proto_dir_root)',
- '<(RULE_INPUT_PATH)',
+ # This path needs to be prefixed by proto_path, so we can't
+ # use RULE_INPUT_PATH (which is an absolute path).
+ '<(proto_dir_root)/<(proto_dir_relpath)/<(RULE_INPUT_NAME)',
'--cpp_out=<(protoc_out_dir)',
],
'message': 'Generating C++ code from <(RULE_INPUT_PATH)',
@@ -107,6 +112,7 @@
],
'dependencies': [
'../../base/base.gyp:base',
+ 'cacheinvalidation_proto',
'cacheinvalidation_proto_cc',
],
'direct_dependent_settings': {
@@ -116,11 +122,11 @@
],
},
'export_dependent_settings': [
+ 'cacheinvalidation_proto',
'cacheinvalidation_proto_cc',
],
},
# Unittests for the cache invalidation library.
- # TODO(akalin): Add these to build/all.gyp.
{
'target_name': 'cacheinvalidation_unittests',
'type': 'executable',
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698