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

Unified Diff: trunk/src/google_apis/gcm/gcm.gyp

Issue 281783004: Revert 270226 "Componentize GCM Part 1: create GCM component and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/google_apis/gcm/engine/mcs_client_unittest.cc ('k') | trunk/src/google_apis/gcm/gcm_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/google_apis/gcm/gcm.gyp
===================================================================
--- trunk/src/google_apis/gcm/gcm.gyp (revision 270233)
+++ trunk/src/google_apis/gcm/gcm.gyp (working copy)
@@ -31,6 +31,7 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../../components/components.gyp:os_crypt',
'../../net/net.gyp:net',
'../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../../third_party/protobuf/protobuf.gyp:protobuf_lite',
@@ -100,8 +101,6 @@
'gcm'
],
'sources': [
- 'base/fake_encryptor.cc',
- 'base/fake_encryptor.h',
'tools/mcs_probe.cc',
],
},
@@ -120,6 +119,7 @@
'dependencies': [
'../../base/base.gyp:run_all_unittests',
'../../base/base.gyp:base',
+ '../../components/components.gyp:os_crypt',
'../../net/net.gyp:net',
'../../net/net.gyp:net_test_support',
'../../testing/gtest.gyp:gtest',
@@ -127,8 +127,6 @@
'gcm'
],
'sources': [
- 'base/fake_encryptor.cc',
- 'base/fake_encryptor.h',
'base/mcs_message_unittest.cc',
'base/mcs_util_unittest.cc',
'base/socket_stream_unittest.cc',
« no previous file with comments | « trunk/src/google_apis/gcm/engine/mcs_client_unittest.cc ('k') | trunk/src/google_apis/gcm/gcm_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698