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

Unified Diff: components/copresence.gypi

Issue 712833002: Undoing revert, cl is not the cause of gcm crash on canary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2214
Patch Set: Created 6 years, 1 month 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 | « components/components_tests.gyp ('k') | components/copresence/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/copresence.gypi
diff --git a/components/copresence.gypi b/components/copresence.gypi
index cf5c10e70782b594c8fc87bed35d8c549d0ae298..1a789cefdce8579602a90c833569365233222961 100644
--- a/components/copresence.gypi
+++ b/components/copresence.gypi
@@ -33,6 +33,8 @@
'copresence/handlers/audio/tick_clock_ref_counted.h',
'copresence/handlers/directive_handler.cc',
'copresence/handlers/directive_handler.h',
+ 'copresence/handlers/gcm_handler.cc',
+ 'copresence/handlers/gcm_handler.h',
'copresence/mediums/audio/audio_manager.h',
'copresence/mediums/audio/audio_manager_impl.cc',
'copresence/mediums/audio/audio_manager_impl.h',
@@ -59,15 +61,23 @@
{
'target_name': 'copresence_test_support',
'type': 'static_library',
+ 'dependencies': [
+ 'copresence_proto',
+ ],
'include_dirs': [
'..',
],
'sources': [
'copresence/test/audio_test_support.cc',
'copresence/test/audio_test_support.h',
+ 'copresence/test/fake_directive_handler.cc',
+ 'copresence/test/fake_directive_handler.h',
'copresence/test/stub_whispernet_client.cc',
'copresence/test/stub_whispernet_client.h',
],
+ 'export_dependent_settings': [
+ 'copresence_proto',
+ ],
},
{
# Protobuf compiler / generate rule for copresence.
@@ -82,6 +92,7 @@
'copresence/proto/data.proto',
'copresence/proto/enums.proto',
'copresence/proto/identity.proto',
+ 'copresence/proto/push_message.proto',
'copresence/proto/rpcs.proto',
],
'variables': {
« no previous file with comments | « components/components_tests.gyp ('k') | components/copresence/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698