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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/cacheinvalidation/cacheinvalidation.gyp

Issue 11085063: Change DEPS to include cacheinvalidation code for Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Changed directory to cacheinvalidation/src and updated README.chromium Created 8 years, 2 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 | « third_party/cacheinvalidation/README.chromium ('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 4e29bf10c32612c1dfcda82c824934c169517703..0f1aac5182c6f94f44b239d8990a048b1a3cbac8 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -7,13 +7,12 @@
# This library should build cleanly with the extra warnings turned on
# for Chromium.
'chromium_code': 1,
- # The relative path of the cacheinvalidation proto files from
- # 'files/src'.
+ # The relative path of the cacheinvalidation proto files from 'src'.
# TODO(akalin): Add a RULE_INPUT_DIR predefined variable to gyp so
# we don't need this variable.
'proto_dir_relpath': 'google/cacheinvalidation',
# Where files generated from proto files are put.
- 'proto_in_dir': 'files/src/<(proto_dir_relpath)',
+ 'proto_in_dir': 'src/<(proto_dir_relpath)',
'proto_out_dir': '<(proto_dir_relpath)',
},
'targets': [
@@ -52,57 +51,57 @@
'overrides/google/cacheinvalidation/deps/stl-namespace.h',
'overrides/google/cacheinvalidation/deps/string_util.h',
'overrides/google/cacheinvalidation/deps/time.h',
- 'files/src/google/cacheinvalidation/deps/digest-function.h',
- 'files/src/google/cacheinvalidation/impl/basic-system-resources.cc',
- 'files/src/google/cacheinvalidation/impl/basic-system-resources.h',
- 'files/src/google/cacheinvalidation/impl/checking-invalidation-listener.cc',
- 'files/src/google/cacheinvalidation/impl/checking-invalidation-listener.h',
- 'files/src/google/cacheinvalidation/impl/client-protocol-namespace-fix.h',
- 'files/src/google/cacheinvalidation/impl/constants.cc',
- 'files/src/google/cacheinvalidation/impl/constants.h',
- 'files/src/google/cacheinvalidation/impl/digest-store.h',
- 'files/src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.cc',
- 'files/src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.h',
- 'files/src/google/cacheinvalidation/impl/invalidation-client-factory.cc',
- 'files/src/google/cacheinvalidation/impl/invalidation-client-impl.cc',
- 'files/src/google/cacheinvalidation/impl/invalidation-client-impl.h',
- 'files/src/google/cacheinvalidation/impl/invalidation-client-util.h',
- 'files/src/google/cacheinvalidation/impl/log-macro.h',
- 'files/src/google/cacheinvalidation/impl/object-id-digest-utils.cc',
- 'files/src/google/cacheinvalidation/impl/object-id-digest-utils.h',
- 'files/src/google/cacheinvalidation/impl/persistence-utils.cc',
- 'files/src/google/cacheinvalidation/impl/persistence-utils.h',
- 'files/src/google/cacheinvalidation/impl/proto-converter.cc',
- 'files/src/google/cacheinvalidation/impl/proto-converter.h',
- 'files/src/google/cacheinvalidation/impl/proto-helpers.h',
- 'files/src/google/cacheinvalidation/impl/proto-helpers.cc',
- 'files/src/google/cacheinvalidation/impl/protocol-handler.cc',
- 'files/src/google/cacheinvalidation/impl/protocol-handler.h',
- 'files/src/google/cacheinvalidation/impl/recurring-task.cc',
- 'files/src/google/cacheinvalidation/impl/recurring-task.h',
- 'files/src/google/cacheinvalidation/impl/registration-manager.cc',
- 'files/src/google/cacheinvalidation/impl/registration-manager.h',
- 'files/src/google/cacheinvalidation/impl/run-state.h',
- 'files/src/google/cacheinvalidation/impl/safe-storage.cc',
- 'files/src/google/cacheinvalidation/impl/safe-storage.h',
- 'files/src/google/cacheinvalidation/impl/simple-registration-store.cc',
- 'files/src/google/cacheinvalidation/impl/simple-registration-store.h',
- 'files/src/google/cacheinvalidation/impl/smearer.h',
- 'files/src/google/cacheinvalidation/impl/statistics.cc',
- 'files/src/google/cacheinvalidation/impl/statistics.h',
- 'files/src/google/cacheinvalidation/impl/throttle.cc',
- 'files/src/google/cacheinvalidation/impl/throttle.h',
- 'files/src/google/cacheinvalidation/impl/ticl-message-validator.cc',
- 'files/src/google/cacheinvalidation/impl/ticl-message-validator.h',
- 'files/src/google/cacheinvalidation/include/invalidation-client.h',
- 'files/src/google/cacheinvalidation/include/invalidation-client-factory.h',
- 'files/src/google/cacheinvalidation/include/invalidation-listener.h',
- 'files/src/google/cacheinvalidation/include/system-resources.h',
- 'files/src/google/cacheinvalidation/include/types.h',
+ 'src/google/cacheinvalidation/deps/digest-function.h',
+ 'src/google/cacheinvalidation/impl/basic-system-resources.cc',
+ 'src/google/cacheinvalidation/impl/basic-system-resources.h',
+ 'src/google/cacheinvalidation/impl/checking-invalidation-listener.cc',
+ 'src/google/cacheinvalidation/impl/checking-invalidation-listener.h',
+ 'src/google/cacheinvalidation/impl/client-protocol-namespace-fix.h',
+ 'src/google/cacheinvalidation/impl/constants.cc',
+ 'src/google/cacheinvalidation/impl/constants.h',
+ 'src/google/cacheinvalidation/impl/digest-store.h',
+ 'src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.cc',
+ 'src/google/cacheinvalidation/impl/exponential-backoff-delay-generator.h',
+ 'src/google/cacheinvalidation/impl/invalidation-client-factory.cc',
+ 'src/google/cacheinvalidation/impl/invalidation-client-impl.cc',
+ 'src/google/cacheinvalidation/impl/invalidation-client-impl.h',
+ 'src/google/cacheinvalidation/impl/invalidation-client-util.h',
+ 'src/google/cacheinvalidation/impl/log-macro.h',
+ 'src/google/cacheinvalidation/impl/object-id-digest-utils.cc',
+ 'src/google/cacheinvalidation/impl/object-id-digest-utils.h',
+ 'src/google/cacheinvalidation/impl/persistence-utils.cc',
+ 'src/google/cacheinvalidation/impl/persistence-utils.h',
+ 'src/google/cacheinvalidation/impl/proto-converter.cc',
+ 'src/google/cacheinvalidation/impl/proto-converter.h',
+ 'src/google/cacheinvalidation/impl/proto-helpers.h',
+ 'src/google/cacheinvalidation/impl/proto-helpers.cc',
+ 'src/google/cacheinvalidation/impl/protocol-handler.cc',
+ 'src/google/cacheinvalidation/impl/protocol-handler.h',
+ 'src/google/cacheinvalidation/impl/recurring-task.cc',
+ 'src/google/cacheinvalidation/impl/recurring-task.h',
+ 'src/google/cacheinvalidation/impl/registration-manager.cc',
+ 'src/google/cacheinvalidation/impl/registration-manager.h',
+ 'src/google/cacheinvalidation/impl/run-state.h',
+ 'src/google/cacheinvalidation/impl/safe-storage.cc',
+ 'src/google/cacheinvalidation/impl/safe-storage.h',
+ 'src/google/cacheinvalidation/impl/simple-registration-store.cc',
+ 'src/google/cacheinvalidation/impl/simple-registration-store.h',
+ 'src/google/cacheinvalidation/impl/smearer.h',
+ 'src/google/cacheinvalidation/impl/statistics.cc',
+ 'src/google/cacheinvalidation/impl/statistics.h',
+ 'src/google/cacheinvalidation/impl/throttle.cc',
+ 'src/google/cacheinvalidation/impl/throttle.h',
+ 'src/google/cacheinvalidation/impl/ticl-message-validator.cc',
+ 'src/google/cacheinvalidation/impl/ticl-message-validator.h',
+ 'src/google/cacheinvalidation/include/invalidation-client.h',
+ 'src/google/cacheinvalidation/include/invalidation-client-factory.h',
+ 'src/google/cacheinvalidation/include/invalidation-listener.h',
+ 'src/google/cacheinvalidation/include/system-resources.h',
+ 'src/google/cacheinvalidation/include/types.h',
],
'include_dirs': [
'./overrides',
- './files/src',
+ './src',
],
'dependencies': [
'../../base/base.gyp:base',
@@ -111,7 +110,7 @@
'direct_dependent_settings': {
'include_dirs': [
'./overrides',
- './files/src',
+ './src',
],
},
# We avoid including header files from
@@ -127,16 +126,16 @@
'target_name': 'cacheinvalidation_unittests',
'type': 'executable',
'sources': [
- 'files/src/google/cacheinvalidation/test/deterministic-scheduler.cc',
- 'files/src/google/cacheinvalidation/test/deterministic-scheduler.h',
- 'files/src/google/cacheinvalidation/test/test-logger.cc',
- 'files/src/google/cacheinvalidation/test/test-logger.h',
- 'files/src/google/cacheinvalidation/test/test-utils.cc',
- 'files/src/google/cacheinvalidation/test/test-utils.h',
- 'files/src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc',
- 'files/src/google/cacheinvalidation/impl/protocol-handler_test.cc',
- 'files/src/google/cacheinvalidation/impl/recurring-task_test.cc',
- 'files/src/google/cacheinvalidation/impl/throttle_test.cc',
+ 'src/google/cacheinvalidation/test/deterministic-scheduler.cc',
+ 'src/google/cacheinvalidation/test/deterministic-scheduler.h',
+ 'src/google/cacheinvalidation/test/test-logger.cc',
+ 'src/google/cacheinvalidation/test/test-logger.h',
+ 'src/google/cacheinvalidation/test/test-utils.cc',
+ 'src/google/cacheinvalidation/test/test-utils.h',
+ 'src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc',
+ 'src/google/cacheinvalidation/impl/protocol-handler_test.cc',
+ 'src/google/cacheinvalidation/impl/recurring-task_test.cc',
+ 'src/google/cacheinvalidation/impl/throttle_test.cc',
],
'dependencies': [
'../../base/base.gyp:base',
« no previous file with comments | « third_party/cacheinvalidation/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698